Commit graph

3048 commits

Author SHA1 Message Date
Joey Poomarin Phloyphisut
e3bc5a85c2 Merge "[USB Audio AIDL] Fix wrong capture path on mixer_paths.xml" into udc-qpr-dev am: 2c8aeb7200 am: 7899f0c8d2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24680285

Change-Id: I244411ffac210548ee6e8446ea69fcf481e1ce78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 05:32:19 +00:00
Joey Poomarin Phloyphisut
7899f0c8d2 Merge "[USB Audio AIDL] Fix wrong capture path on mixer_paths.xml" into udc-qpr-dev am: 2c8aeb7200
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24680285

Change-Id: I7b1a4d6653764d487f83c7ebb0e60d742efc1602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 04:41:16 +00:00
Joey Poomarin Phloyphisut
2c8aeb7200 Merge "[USB Audio AIDL] Fix wrong capture path on mixer_paths.xml" into udc-qpr-dev 2023-09-12 03:48:25 +00:00
Ankur Bakshi
649aacf063 Update felix SVN to 27 am: f6c3f2ce0c am: d5b94a8bf9 am: f4f659fd30 am: 084a0cce73
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675

Change-Id: I320ed20c9c3b7b8735041a4fb9927a59786c9af6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 21:39:16 +00:00
Ankur Bakshi
f48fdebada Update felix SVN to 26 am: c49c6b44d2 am: f6c261df65 am: f0bcbbecfe am: 0f07a5952a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728

Change-Id: I12ea9f9e2a2007c6102ae59e5ea7f17c9c2cef02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 21:39:10 +00:00
Ankur Bakshi
44a697ef62 Update felix SVN to 27 am: f6c3f2ce0c am: 9d89d73d20 am: 0e960a76ac am: 5ad01ea4b8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675

Change-Id: I6906d2eb245d9520885cb806cbe09abd5c63bfc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 21:35:04 +00:00
Ankur Bakshi
b6173edbc9 Update felix SVN to 26 am: c49c6b44d2 am: d9028f34f0 am: d4f5bdbe96 am: ce8878b673
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728

Change-Id: I5519e90a21cd145dd30234efd2e39a308514082b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 21:35:01 +00:00
Ankur Bakshi
44873b830f Update felix SVN to 27 am: f6c3f2ce0c am: d5b94a8bf9 am: 9a6d834f44 am: a362d8f1a3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675

Change-Id: I7a42d416ad68fc1e01432715319597f222412c9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 21:28:12 +00:00
Ankur Bakshi
5c6fd07529 Update felix SVN to 26 am: c49c6b44d2 am: f6c261df65 am: 2d5e5165aa am: 1e61a926d4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728

Change-Id: I455d58deb5889a900e6afec407a8adc84468df60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 21:28:08 +00:00
Ankur Bakshi
084a0cce73 Update felix SVN to 27 am: f6c3f2ce0c am: d5b94a8bf9 am: f4f659fd30
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675

Change-Id: Ica9474497b356c9dc077701a0554cfa18ed4c2df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:34:37 +00:00
Ankur Bakshi
0f07a5952a Update felix SVN to 26 am: c49c6b44d2 am: f6c261df65 am: f0bcbbecfe
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728

Change-Id: Ibf3de71c6586b26c02e5b536540f3adfcd53d8d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:34:35 +00:00
Ankur Bakshi
5ad01ea4b8 Update felix SVN to 27 am: f6c3f2ce0c am: 9d89d73d20 am: 0e960a76ac
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675

Change-Id: I24614d51b9248ab046ac17db428d587b757f1cab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:31:31 +00:00
Ankur Bakshi
ce8878b673 Update felix SVN to 26 am: c49c6b44d2 am: d9028f34f0 am: d4f5bdbe96
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728

Change-Id: I937df6ccfc35a471ccee62d94e943735aef58ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:31:28 +00:00
Ankur Bakshi
a362d8f1a3 Update felix SVN to 27 am: f6c3f2ce0c am: d5b94a8bf9 am: 9a6d834f44
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675

Change-Id: Ic7c76ce1f7fbf1b3cac2488204c3e0b7f387f99a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:29:29 +00:00
Ankur Bakshi
1e61a926d4 Update felix SVN to 26 am: c49c6b44d2 am: f6c261df65 am: 2d5e5165aa
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728

Change-Id: I75632114071c33eab787955becd1129a367b37e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:29:27 +00:00
Ankur Bakshi
77def43bde Update felix SVN to 27 am: f6c3f2ce0c am: 12549db1a6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675

Change-Id: I043ebdcae4d6ca2de88fc8056afb5bba31af8505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:53:53 +00:00
Ankur Bakshi
9e81f29617 Update felix SVN to 26 am: c49c6b44d2 am: 99b6f84750
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728

Change-Id: Ie47ef3449a5c562939745fa7857053d279325b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:53:51 +00:00
Ankur Bakshi
f4f659fd30 Update felix SVN to 27 am: f6c3f2ce0c am: d5b94a8bf9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675

Change-Id: I73a52d9df7159aa2408cc05710a054e434d0f8a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:49:45 +00:00
Ankur Bakshi
f0bcbbecfe Update felix SVN to 26 am: c49c6b44d2 am: f6c261df65
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728

Change-Id: I34e2fc8175444438a459c524c6d0bd39a39251f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:49:42 +00:00
Ankur Bakshi
0e960a76ac Update felix SVN to 27 am: f6c3f2ce0c am: 9d89d73d20
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675

Change-Id: I55cf2a91331eb705650e1605c7893e47303208e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:49:39 +00:00
Ankur Bakshi
d4f5bdbe96 Update felix SVN to 26 am: c49c6b44d2 am: d9028f34f0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728

Change-Id: I4311d6171d6a8f96ef73a11fdd913ad870a5db55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:49:36 +00:00
Ankur Bakshi
9a6d834f44 Update felix SVN to 27 am: f6c3f2ce0c am: d5b94a8bf9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675

Change-Id: I0fd0ff42af30f472b48fe7f50913c840fac16e3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:45:52 +00:00
Ankur Bakshi
2d5e5165aa Update felix SVN to 26 am: c49c6b44d2 am: f6c261df65
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728

Change-Id: I733082c9d7fab216b44e7926ca76fe27c66f97cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:45:49 +00:00
Ankur Bakshi
d5b94a8bf9 Update felix SVN to 27 am: f6c3f2ce0c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675

Change-Id: Id499beb6224f0f014603e2b4fe66d5d3603faae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:53:43 +00:00
Ankur Bakshi
f6c261df65 Update felix SVN to 26 am: c49c6b44d2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728

Change-Id: I56a42978fee63649a6d78a7a14df7d7fe320beb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:53:40 +00:00
Ankur Bakshi
12549db1a6 Update felix SVN to 27 am: f6c3f2ce0c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675

Change-Id: I2a82aa1eed7acfadd16c874a35386f7445000fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:52:35 +00:00
Ankur Bakshi
99b6f84750 Update felix SVN to 26 am: c49c6b44d2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728

Change-Id: I1b81e395f780e4349b72f22d65d35d85ad8d455d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:52:32 +00:00
Ankur Bakshi
9d89d73d20 Update felix SVN to 27 am: f6c3f2ce0c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24699675

Change-Id: I9cc17adb6cea0c3d07df1cf2bebe57afb1a4c08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:50:05 +00:00
Ankur Bakshi
d9028f34f0 Update felix SVN to 26 am: c49c6b44d2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24687728

Change-Id: Id72880a559a34e3116b06dc21a2eabb3054e42e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:50:03 +00:00
Poomarin Phloyphisut
ea7df9651e [USB Audio AIDL] Fix wrong capture path on mixer_paths.xml
Bug: 299388175
Test: Local Test
Change-Id: Ib71d73b5190375837a10f6f53b9f25d309b8f422
2023-09-10 15:57:07 +00:00
Paulsu Su
120b829818 Merge "F10 camera pmu tuning with on 60fps case" into udc-qpr-dev am: 9fb4156300 am: f39d32b855
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24141377

Change-Id: Ib1ede35930be3285709a567351b9ce953bdf4525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-09 00:16:12 +00:00
Shivangi Dubey
26b7e7c418 [automerger skipped] Merge "Merge "Refine fold setting" into udc-qpr-dev am: 9e5f0664e4" into udc-qpr-dev-plus-aosp am: b61a9a59c5 -s ours
am skip reason: Merged-In I59e8ba653bdac397eec0be60b931dc1c6649843c with SHA-1 61519d18a6 is already in history

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

Change-Id: Ib2494bb8c98cf6e1d1f73a2f974f9c924ee630f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 23:04:24 +00:00
Shivangi Dubey
8cd720051a [automerger skipped] Merge "Refine fold setting" into udc-qpr-dev am: 9e5f0664e4 am: f3c4e4a78c -s ours
am skip reason: Merged-In I59e8ba653bdac397eec0be60b931dc1c6649843c with SHA-1 61519d18a6 is already in history

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

Change-Id: I042d838d80d3298e4b4833a65795cf7d189c7d83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 23:04:15 +00:00
Paulsu Su
f39d32b855 Merge "F10 camera pmu tuning with on 60fps case" into udc-qpr-dev am: 9fb4156300
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24141377

Change-Id: I0f1270f86c71bf57f497b408e2068f62c3b3cadf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 16:44:09 +00:00
Shivangi Dubey
b61a9a59c5 Merge "Merge "Refine fold setting" into udc-qpr-dev am: 9e5f0664e4" into udc-qpr-dev-plus-aosp 2023-09-08 15:13:51 +00:00
Ankur Bakshi
f6c3f2ce0c Update felix SVN to 27
Bug: 298087649
Change-Id: I3466d207247e9a8fc26c785e197b16668d33390c
2023-09-08 01:35:40 +00:00
Paulsu Su
9fb4156300 Merge "F10 camera pmu tuning with on 60fps case" into udc-qpr-dev 2023-09-07 08:42:28 +00:00
Ankur Bakshi
c49c6b44d2 Update felix SVN to 26
Bug: 298087649
Change-Id: I8241b1c4cb733ba18e7970ec74be837b53371707
2023-09-07 05:19:20 +00:00
Wilson Sung
b1daa78ce4 Update UWB CERTIFICATE to PRESIGNED am: 0d937f7123 am: 981057ce92 am: 28f78b35aa
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24681110

Change-Id: I2c290ad639e459b67e6bfe46328257126e0f8cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 00:31:01 +00:00
Wilson Sung
28f78b35aa Update UWB CERTIFICATE to PRESIGNED am: 0d937f7123 am: 981057ce92
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24681110

Change-Id: I4778a346adf35e0fe975d573e06b99864ca439eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 23:34:10 +00:00
Wilson Sung
981057ce92 Update UWB CERTIFICATE to PRESIGNED am: 0d937f7123
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24681110

Change-Id: I77be0eb165344b3b9a6e32d6cbe4518d67daec04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 22:56:30 +00:00
Wilson Sung
0d937f7123 Update UWB CERTIFICATE to PRESIGNED
Bug: 290766628
Change-Id: Id5ec87873a34a7c27f1b90209385884196efae1d
2023-09-06 17:26:18 +00:00
Shivangi Dubey
f3c4e4a78c Merge "Refine fold setting" into udc-qpr-dev am: 9e5f0664e4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24446088

Change-Id: If23d5a50eb94fd908a52c7bf2b7d4b66c2c86365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 15:06:39 +00:00
Shivangi Dubey
9e5f0664e4 Merge "Refine fold setting" into udc-qpr-dev 2023-09-06 14:28:45 +00:00
dshivangi
eb1b08f16b Refine fold setting
Current fold setting has a toggle button which can enable the “Stay unlocked on fold” setting.
Create a new page for fold setting which will allow us to choose something from three options.(https://screenshot.googleplex.com/6W65aTYtigGpr3v)
 *Always - Front display turns on when you fold your device [Currently available setting]
 *Only games, videos, and more - Front display turns on for apps that stop your screen going idle [Default]
 *Never - Front display locks when you fold your device [New option for user]

Test: atest FoldLockBehaviorSettingsTest FoldLockBehaviorPreferenceControllerTest
*Manual
  Flash the build with these changes
  Manually select options one by one
  Observe the behavior

Fixes: 294194379
Change-Id: I59e8ba653bdac397eec0be60b931dc1c6649843c
Merged-In: I59e8ba653bdac397eec0be60b931dc1c6649843c
2023-09-06 10:50:23 +00:00
Shivangi Dubey
04fac1660b Merge "Refine fold setting" into main 2023-09-06 10:47:26 +00:00
Xin Li
f073cf5da3 [automerger skipped] Merge UP1A.230905.019 am: 12032b942f -s ours am: 32953a9018 -s ours am: f34af8bb46 -s ours am: f31fcb9dd8 -s ours
am skip reason: Merged-In I4890e0ed2191993887aa550053a827c2aca3aafe with SHA-1 64da307f5f is already in history

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

Change-Id: I63f69a23615910a6a355d069a6ea1c835e843e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 21:26:52 +00:00
Xin Li
f31fcb9dd8 [automerger skipped] Merge UP1A.230905.019 am: 12032b942f -s ours am: 32953a9018 -s ours am: f34af8bb46 -s ours
am skip reason: Merged-In I4890e0ed2191993887aa550053a827c2aca3aafe with SHA-1 64da307f5f is already in history

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

Change-Id: I378fc6846d8c64a0a7a8099e59cfbb62f5b13bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 21:07:28 +00:00
Xin Li
f34af8bb46 [automerger skipped] Merge UP1A.230905.019 am: 12032b942f -s ours am: 32953a9018 -s ours
am skip reason: Merged-In I4890e0ed2191993887aa550053a827c2aca3aafe with SHA-1 64da307f5f is already in history

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

Change-Id: I192dbf0edc60f1db233201777bef349a46f7c83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 20:34:36 +00:00
Xin Li
32953a9018 [automerger skipped] Merge UP1A.230905.019 am: 12032b942f -s ours
am skip reason: Merged-In I4890e0ed2191993887aa550053a827c2aca3aafe with SHA-1 64da307f5f is already in history

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

Change-Id: I482d9b52ba5b5beb6888719e8609cd75adc73e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:45:20 +00:00