Commit Graph

2698 Commits

Author SHA1 Message Date
Xin Li
a421ceac2c Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I0b45c28183e3ba3225eb925cf3fd2110a14c1b2b
Change-Id: I0065ebafcd8db6d9348f51da75f30fab720968f5
2024-05-13 13:11:03 -07:00
Wei Li
1d4297808c Move license metadata declarations to meta-lic.mk and remove the Android.mk file. am: e839be5fd4
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/3077691

Change-Id: I6e6a7b7298b32ff0758137e3d94dc3d64373d487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 04:11:45 +00:00
Wei Li
e839be5fd4 Move license metadata declarations to meta-lic.mk and remove the Android.mk file.
Bug: 311544087
Test: CIs
Change-Id: I3521dea829aa2e26072181dc00702cf471ebecf3
2024-05-07 16:36:51 -07:00
Treehugger Robot
736c5de611 Merge "Convert Android.mk to Android.bp under redfin/dumpstate" into main am: d8abfb0361
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2836012

Change-Id: I75f3d771a99b6bd2a3c94242f8fa527791c2a46f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 18:37:51 +00:00
Treehugger Robot
d8abfb0361 Merge "Convert Android.mk to Android.bp under redfin/dumpstate" into main 2024-04-30 18:14:46 +00:00
Xin Li
80271318ac [automerger skipped] Merge Android 14 QPR2 to AOSP main am: dfd63b7edc -s ours
am skip reason: Merged-In I41325acda1e8805b210b589f69ed2b70e047ce66 with SHA-1 092e9507a1 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2989220

Change-Id: I94c9c1eb58bd73766c9ace120f56ccd41afb3f40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 09:55:26 +00:00
Xin Li
dfd63b7edc Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: I41325acda1e8805b210b589f69ed2b70e047ce66
Change-Id: I191e783bd56684e501f75ad716f008b7565eb13f
2024-03-06 09:29:49 -08:00
Brad Lassey
d305a9d37d Enabling Observe mode
Bug: 327601464
Test: Tested on local device
Change-Id: I0b45c28183e3ba3225eb925cf3fd2110a14c1b2b
2024-02-29 20:08:09 +00:00
Xin Li
824d9bf016 [automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 092e9507a1 -s ours
am skip reason: Merged-In Ic565eeda1ec928e59be8a3a2c406ab799ef879a0 with SHA-1 0bb31c7af7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/25973469

Change-Id: I4c71935d8413adce610d95e9f1cd8372780ded6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-31 02:03:39 +00:00
Xin Li
092e9507a1 Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: Ic565eeda1ec928e59be8a3a2c406ab799ef879a0
Change-Id: I41325acda1e8805b210b589f69ed2b70e047ce66
2024-01-17 22:13:05 -08:00
Kuen-Han Tsai
31855bcfa0 Usb.cpp: Fix typos when unable to disable USB data am: 8b09c31e5f am: e9056c8f4e am: 011268c7e5 am: 2e5131b745
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/25566799

Change-Id: Ia6305b2fcfeab174fe3bcd1ac00ace65d3fc1fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 07:25:37 +00:00
Kuen-Han Tsai
2e5131b745 Usb.cpp: Fix typos when unable to disable USB data am: 8b09c31e5f am: e9056c8f4e am: 011268c7e5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/25566799

Change-Id: I87be3d3646620c16358a84ec9ac971765dd3960a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 06:22:27 +00:00
Kuen-Han Tsai
0473478f70 Usb.cpp: Fix typos when unable to disable USB data am: 8b09c31e5f am: c0903ade11
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/25566799

Change-Id: Idb718e937acc0c736521bd4b5a380851f7cc1d2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 05:47:42 +00:00
Kuen-Han Tsai
011268c7e5 Usb.cpp: Fix typos when unable to disable USB data am: 8b09c31e5f am: e9056c8f4e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/25566799

Change-Id: Icb399eae650496e270dbaadbbd1a48222aae738d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 05:47:23 +00:00
Kuen-Han Tsai
c0903ade11 Usb.cpp: Fix typos when unable to disable USB data am: 8b09c31e5f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/25566799

Change-Id: I89f2944c4bbb21f63ab0913cfe9631ca69516f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 04:28:44 +00:00
Kuen-Han Tsai
e9056c8f4e Usb.cpp: Fix typos when unable to disable USB data am: 8b09c31e5f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/25566799

Change-Id: Ie1b5e63371551bbd9b6fd64d67d44621bf70494f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 04:25:00 +00:00
Treehugger Robot
7d20bba616 [automerger skipped] Merge "Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"" into main am: c9084eb711 am: 2585699ae7 am: fb7c067a8b -s ours
am skip reason: Merged-In Ic565eeda1ec928e59be8a3a2c406ab799ef879a0 with SHA-1 0bb31c7af7 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2863087

Change-Id: I119542d91d33c227d3f0222d7ea43c3f794fae74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 23:23:04 +00:00
Xin Li
a25287c8d0 [automerger skipped] Merge Android 14 QPR1 am: 81e4f48977 -s ours am: c48cfee7e6 -s ours am: da444cad95 -s ours
am skip reason: Merged-In I0ac7b7a8f95e33f5cd88b4be0d9e4ec84b93a0c0 with SHA-1 2156e0d5ed is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2865779

Change-Id: I6f5b757ed06935d14e0832be788fe8eacf807345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:57:58 +00:00
Treehugger Robot
fb7c067a8b Merge "Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"" into main am: c9084eb711 am: 2585699ae7
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2863087

Change-Id: I5026b5c7e419548ab039fa1496f3ed6ce9c1a8e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:40:03 +00:00
Treehugger Robot
2585699ae7 Merge "Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"" into main am: c9084eb711
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2863087

Change-Id: Iddeecbf6cb78383913f1c0b39172603e6a4f5798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:18:08 +00:00
Xin Li
da444cad95 [automerger skipped] Merge Android 14 QPR1 am: 81e4f48977 -s ours am: c48cfee7e6 -s ours
am skip reason: Merged-In I0ac7b7a8f95e33f5cd88b4be0d9e4ec84b93a0c0 with SHA-1 2156e0d5ed is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2865779

Change-Id: Ifd6221e7acb72aaefa09011efce1f0791700d525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:02:46 +00:00
Treehugger Robot
c9084eb711 Merge "Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"" into main 2023-12-11 22:00:34 +00:00
Xin Li
c48cfee7e6 [automerger skipped] Merge Android 14 QPR1 am: 81e4f48977 -s ours
am skip reason: Merged-In I0ac7b7a8f95e33f5cd88b4be0d9e4ec84b93a0c0 with SHA-1 2156e0d5ed is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2865779

Change-Id: I02f10db97da428ed0a97bc9bcfec081eec4ad7fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:16:56 +00:00
Xin Li
81e4f48977 Merge Android 14 QPR1
Merged-In: I0ac7b7a8f95e33f5cd88b4be0d9e4ec84b93a0c0
Bug: 315507370
Change-Id: I217003c5b9e1a533dce770f031352a8e0e08a7d0
2023-12-08 13:13:47 -08:00
Roshan Pius
0f0ee71877 Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"
3c2aa5f3a2

Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0bb31c7af7919e0103df385fce664e04d36952a2)
Merged-In: Ic565eeda1ec928e59be8a3a2c406ab799ef879a0
Change-Id: Ic565eeda1ec928e59be8a3a2c406ab799ef879a0
2023-12-06 21:32:29 +00:00
Kuen-Han Tsai
8b09c31e5f Usb.cpp: Fix typos when unable to disable USB data
If Usb.cpp cannot write a zero value to the USB_DATA_PATH file, display
the message of "Not able to turn off usb connection notification".

Test: refactoring CL. Existing tests still pass.
Bug: 301016122
Change-Id: I6ce626ed37c245dc1c23f25aff7e24befe9b7fe8
2023-12-06 02:36:12 +00:00
Roshan Pius
0bb31c7af7 Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"
3c2aa5f3a2

Bug: 303286040
Test: Compiles

Change-Id: Ic565eeda1ec928e59be8a3a2c406ab799ef879a0
2023-12-04 13:52:10 -08:00
Treehugger Robot
e634bb5904 Merge "Remove unused Android.mk under device/google/redfin am: a9544cd2ed am: 2156e0d5ed" into udc-qpr-dev-plus-aosp am: 54edddfb8d
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2836011

Change-Id: I9856ccf929cc516103865d61c893f5d049507e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 04:04:37 +00:00
Treehugger Robot
54edddfb8d Merge "Remove unused Android.mk under device/google/redfin am: a9544cd2ed am: 2156e0d5ed" into udc-qpr-dev-plus-aosp 2023-11-21 03:25:35 +00:00
Herbert Xue
a0bfd7f8ce Remove unused Android.mk under device/google/redfin am: a9544cd2ed am: 65df820ad4 am: bf6667dd1d
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2836011

Change-Id: If7047a5c555305128d937a458d5c9dbb0471096f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 03:14:57 +00:00
Herbert Xue
bf6667dd1d Remove unused Android.mk under device/google/redfin am: a9544cd2ed am: 65df820ad4
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2836011

Change-Id: Ied8d486a0f2ab48acad2971f50a03f01801465fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 02:43:51 +00:00
Herbert Xue
f7a8d0bc31 Remove unused Android.mk under device/google/redfin am: a9544cd2ed am: 2156e0d5ed
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2836011

Change-Id: I3e2e4b292d167feb0bebfc0d99d15beeb5c9f328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:55:02 +00:00
Herbert Xue
65df820ad4 Remove unused Android.mk under device/google/redfin am: a9544cd2ed
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2836011

Change-Id: I41822151070efae7fc8988079bfc20d763639d7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:24:05 +00:00
Herbert Xue
2156e0d5ed Remove unused Android.mk under device/google/redfin am: a9544cd2ed
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2836011

Change-Id: I0ac7b7a8f95e33f5cd88b4be0d9e4ec84b93a0c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:23:53 +00:00
Herbert Xue
f43a72c598 Convert Android.mk to Android.bp under redfin/dumpstate
Bug: 311544087
Test: lunch aosp_redfin-trunk_staging-userdebug, m android.hardware.dumpstate@1.1-service.redfin
Change-Id: I40e70657f57cda1240594d13bcef79ec0e155a33
2023-11-17 14:03:43 +08:00
Herbert Xue
a9544cd2ed Remove unused Android.mk under device/google/redfin
Bug: 311544087
Test: NA
Change-Id: Idb858726b083d2f91ce17f4627aadff89a942b8c
2023-11-17 13:36:44 +08:00
YiKai Peng
86a532c4c6 Merge "WLC: update AIDL manifest version to 1-2" into main 2023-11-16 08:24:42 +00:00
YiKai Peng
8f1f820f68 WLC: update AIDL manifest version to 1-2
Bug: 310109332
Test: Build/Flash
Change-Id: I8f3ca2f8f3ba979c466dc98fd772164767ef75df
Signed-off-by: YiKai Peng <kenpeng@google.com>
2023-11-16 06:50:31 +00:00
Thales Lima
0f7b441e18 Revert "WLC: update AIDL manifest version to 2"
Revert submission 25370033-wlc_aidl_v2

Reason for revert: /b/311146944

Reverted changes: /q/submissionid:25370033-wlc_aidl_v2

Change-Id: I7da8286a1327a74be942867c4f7db7e2fc3e0f87
2023-11-15 11:22:56 +00:00
YiKai Peng
494c9cdfa1 WLC: update AIDL manifest version to 2
Bug: 310109332
Test: Build/Flash
Change-Id: Iecf289f931d1a5280d83de65779e6b5dc3763ef0
Signed-off-by: YiKai Peng <kenpeng@google.com>
2023-11-14 09:48:51 +00:00
Roshan Pius
836ff8f353 [automerger skipped] Merge "Revert "redfin(nfc): Modify NFC overlays for NFC apex"" into main am: f7b6db1592 am: 8a129cddad am: 666986445d -s ours
am skip reason: Merged-In Icb67edebd8c0579cd015fe8a8956ae45426002ae with SHA-1 3c2aa5f3a2 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2818125

Change-Id: I2286c4fcdeceb94689564ce7c0b7b0b9ee487960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:34:21 +00:00
Roshan Pius
879b6e1647 [automerger skipped] Merge "Revert "redfin(nfc): Modify NFC overlays for NFC apex"" into main am: f7b6db1592 am: 7460bf3649 am: c3fe8c8e81 -s ours
am skip reason: Merged-In Icb67edebd8c0579cd015fe8a8956ae45426002ae with SHA-1 3c2aa5f3a2 is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2818125

Change-Id: Ie06ec5f1674eedd3d14108b27c390a99d47d21ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:30:34 +00:00
Roshan Pius
666986445d Merge "Revert "redfin(nfc): Modify NFC overlays for NFC apex"" into main am: f7b6db1592 am: 8a129cddad
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2818125

Change-Id: If7d77a80bd985fce515e4cd2358684117b002aa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:39 +00:00
Roshan Pius
c3fe8c8e81 Merge "Revert "redfin(nfc): Modify NFC overlays for NFC apex"" into main am: f7b6db1592 am: 7460bf3649
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2818125

Change-Id: Ice4220432f345f2034915b0842401d822534cd8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:05 +00:00
Roshan Pius
8a129cddad Merge "Revert "redfin(nfc): Modify NFC overlays for NFC apex"" into main am: f7b6db1592
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2818125

Change-Id: I22be636503e838cb89fb789349162706bd4e4d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:48:52 +00:00
Roshan Pius
7460bf3649 Merge "Revert "redfin(nfc): Modify NFC overlays for NFC apex"" into main am: f7b6db1592
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2818125

Change-Id: I33d3fa29f45923dbf850fadd514d9cf0eb4d6eee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:24 +00:00
Roshan Pius
f7b6db1592 Merge "Revert "redfin(nfc): Modify NFC overlays for NFC apex"" into main 2023-11-08 21:16:19 +00:00
Roshan Pius
b21527bc6c Revert "redfin(nfc): Modify NFC overlays for NFC apex"
Revert submission 2802548-nfc_apex

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:2802548-nfc_apex

Bug: 309117462
Test: Compiles, device boots up
Merged-In: Icb67edebd8c0579cd015fe8a8956ae45426002ae
Change-Id: Icb67edebd8c0579cd015fe8a8956ae45426002ae
2023-11-06 19:46:20 +00:00
Roshan Pius
3c2aa5f3a2 Revert "redfin(nfc): Modify NFC overlays for NFC apex"
Revert submission 2802548-nfc_apex

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:2802548-nfc_apex

Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://android-review.googlesource.com/q/commit:af4a9967146824b1194f536ddb417b5f783806d7)
Merged-In: Icb67edebd8c0579cd015fe8a8956ae45426002ae
Change-Id: Icb67edebd8c0579cd015fe8a8956ae45426002ae
2023-11-04 19:05:11 +00:00
Greg Kaiser
028aa2889c [automerger skipped] Fix lunch choices for git_main am: 95edaa292e am: 1cd429935b -s ours am: 7b6c37049a -s ours
am skip reason: Merged-In I400392ba9cf7e6d35af78d6b668d52abee27497d with SHA-1 95edaa292e is already in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2811313

Change-Id: I871b40469b4011857935616b547155128c2e15ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 00:14:45 +00:00