Treehugger Robot
|
8179169fb9
|
Merge "[CCA] Set enable flag by default on Felix." into main
|
2023-12-08 06:53:03 +00:00 |
|
Xin Li
|
fb14bb624a
|
Merge UQ1A.231205.015
Bug: 308969284
Merged-In: Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359
Change-Id: I93f5517088b4d09d9e241b2d3b4e9c4d26a24934
|
2023-12-07 15:51:48 -08:00 |
|
Roshan Pius
|
bd1c49a92b
|
Revert^2 "felix(nfc): Modify NFC overlays for NFC apex"
e274b4177a
Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7777a61a891357a9e50ca21d9b6ac730647dc995)
Merged-In: I56beefccd8cd5f5d12f6b867a31af60314826242
Change-Id: I56beefccd8cd5f5d12f6b867a31af60314826242
Change-Id: Ib7b639849fed4d39424866716d5eee2c5248a312
|
2023-12-07 10:25:36 -08:00 |
|
Roshan Pius
|
4f0ccbaa17
|
Revert^2 "felix: Replace NFC app with NFC apex"
09c1ce320b
Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d67ac5d535e382e03ce2be6ebcd73f50e5aea4e2)
Merged-In: I958b2a07dbde6f036b3a615fde6e4255c59a0843
Change-Id: I958b2a07dbde6f036b3a615fde6e4255c59a0843
|
2023-12-06 21:31:29 +00:00 |
|
Roshan Pius
|
7777a61a89
|
Revert^2 "felix(nfc): Modify NFC overlays for NFC apex"
e274b4177a
Bug: 303286040
Test: Compiles
Change-Id: I56beefccd8cd5f5d12f6b867a31af60314826242
|
2023-12-04 13:55:08 -08:00 |
|
Roshan Pius
|
d67ac5d535
|
Revert^2 "felix: Replace NFC app with NFC apex"
09c1ce320b
Bug: 303286040
Test: Compiles
Change-Id: I958b2a07dbde6f036b3a615fde6e4255c59a0843
|
2023-12-04 11:42:23 -08:00 |
|
Ankur Bakshi
|
ba9e34eeb8
|
Update felix SVN to 35 am: a2ba6a3626 am: a17750c933
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25498280
Change-Id: If8bdf679ea205615c61d38cacc358276a81e7501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-11-29 23:05:27 +00:00 |
|
Ankur Bakshi
|
1ebb5378f5
|
Update felix SVN to 34 am: 70828aea7c am: 5195fe5d33
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25497758
Change-Id: I4d826f4bcb5b677529a192f8106104e2e9334a0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-11-29 23:05:23 +00:00 |
|
Ankur Bakshi
|
a17750c933
|
Update felix SVN to 35 am: a2ba6a3626
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25498280
Change-Id: I5f1e7c3a1273afc8257d515f5af71c5ccf22f38c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-11-29 22:35:08 +00:00 |
|
Ankur Bakshi
|
5195fe5d33
|
Update felix SVN to 34 am: 70828aea7c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25497758
Change-Id: Ic2de088aa19cb9e9dfdf6cfd48456c51f3762563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-11-29 22:34:59 +00:00 |
|
Ankur Bakshi
|
a2ba6a3626
|
Update felix SVN to 35
Bug: 313696499
Change-Id: I0e48bc56e019bcec717685f2e9f2ce2ce23f06af
|
2023-11-29 06:41:34 +00:00 |
|
Ankur Bakshi
|
70828aea7c
|
Update felix SVN to 34
Bug: 313696499
Change-Id: I8e4178345c1e91d3dd7b203ac4462e29c07aff0b
|
2023-11-29 06:34:50 +00:00 |
|
Shin-Yu Wang
|
3479774dae
|
Merge "Update idle timer setting" into main
|
2023-11-21 02:26:46 +00:00 |
|
Ankur Bakshi
|
89e5ec5c2f
|
Update felix SVN to 33 am: faf934e258 am: 3f165557b8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25365247
Change-Id: I61826ef22957ba948d1bf31cb91083c921afd4cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-11-16 22:05:42 +00:00 |
|
Ankur Bakshi
|
3f165557b8
|
Update felix SVN to 33 am: faf934e258
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25365247
Change-Id: I5368e35b8ffdb22c58d9c2caee8198b57240c9f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-11-16 21:35:15 +00:00 |
|
Ankur Bakshi
|
1a3182a6dd
|
Update felix SVN to 32 am: fbb91bcaa4 am: 84b4c53f2e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25343626
Change-Id: Icd59808b99abeaadc8ac22aa712852b2078ad697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-11-16 04:59:08 +00:00 |
|
Ankur Bakshi
|
84b4c53f2e
|
Update felix SVN to 32 am: fbb91bcaa4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25343626
Change-Id: Ib210a8a5abdd5e3b60df24558293f6c719df5e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-11-16 04:28:59 +00:00 |
|
Ankur Bakshi
|
faf934e258
|
Update felix SVN to 33
Bug: 309529736
Change-Id: Ic9fcbd860c7882a10f49123e931799a81a6fc059
|
2023-11-14 04:03:22 +00:00 |
|
Ankur Bakshi
|
fbb91bcaa4
|
Update felix SVN to 32
Bug: 309529736
Change-Id: I848a8e5489e68040ae10ec18760497a6c6a86500
|
2023-11-11 02:32:11 +00:00 |
|
Ankur Bakshi
|
59bcdfbd32
|
Update felix SVN to 31 am: 55b74d41e9 am: 03e4dfdb9b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25293153
Change-Id: I9672a948af23cc7618fdb7605f3c98a2ab517482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-11-11 02:10:29 +00:00 |
|
Ankur Bakshi
|
03e4dfdb9b
|
Update felix SVN to 31 am: 55b74d41e9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25293153
Change-Id: Ic0969e706d861cc474c41220068a8b9a841ca44f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-11-11 01:39:01 +00:00 |
|
Ankur Bakshi
|
55b74d41e9
|
Update felix SVN to 31
Bug: 302612466
Change-Id: Id914c4cfcb72b896b750446b663bd9e2be43e34e
|
2023-11-10 23:15:11 +00:00 |
|
Roshan Pius
|
bfca1a6f59
|
Merge changes from topic "nfc_apex_revert" into main am: 4bc515224b am: f94b13f69d
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2817310
Change-Id: Idcbbf3af8d330170c9953a28a74987b8a0c1c43c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-11-08 22:46:09 +00:00 |
|
Roshan Pius
|
72c38dc683
|
Revert "felix(nfc): Modify NFC overlays for NFC apex" am: 98699d7fb9 am: 1cabb5c5a8
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2818128
Change-Id: If7429732d051c55246986f6c3639a35991cea7a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-11-08 22:46:03 +00:00 |
|
Roshan Pius
|
f94b13f69d
|
Merge changes from topic "nfc_apex_revert" into main am: 4bc515224b
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2817310
Change-Id: I0a1af4db29e0c8d1c596572f6346e808a8e31716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-11-08 21:45:30 +00:00 |
|
Roshan Pius
|
1cabb5c5a8
|
Revert "felix(nfc): Modify NFC overlays for NFC apex" am: 98699d7fb9
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2818128
Change-Id: Ib829c4d8b660a795d38ca72ba71556a2732c291d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-11-08 21:45:23 +00:00 |
|
Poomarin Phloyphisut
|
e32682b14c
|
[CCA] Set enable flag by default on Felix.
Bug: 309566086
Test: N/A
Change-Id: Ibf847c16f69d8606b2fec8fe82930a7149632290
|
2023-11-07 07:01:15 +00:00 |
|
Roshan Pius
|
7091f06342
|
Revert "felix: Replace NFC app with NFC apex"
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056
Reason for revert: Causing bootloop with signed builds
Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056
Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:09c1ce320b7948c069bc48645b90eb55cae2bd3e)
Merged-In: Ib09ea604351cea2c4ed40e64c0bf783a666eb08b
Change-Id: Ib09ea604351cea2c4ed40e64c0bf783a666eb08b
|
2023-11-07 06:11:02 +00:00 |
|
Roshan Pius
|
98699d7fb9
|
Revert "felix(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: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
Change-Id: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
|
2023-11-06 19:45:22 +00:00 |
|
Roshan Pius
|
8296448354
|
Merge "Revert "felix: Replace NFC app with NFC apex"" into main
|
2023-11-06 14:31:02 +00:00 |
|
Roshan Pius
|
e274b4177a
|
Revert "felix(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:9b9ed35e2791458c36b792ee049972c978b75606)
Merged-In: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
Change-Id: Ic36d5e92cb4dd5b842cbf0d5de81a0548d63c77f
|
2023-11-04 19:04:38 +00:00 |
|
Roshan Pius
|
09c1ce320b
|
Revert "felix: Replace NFC app with NFC apex"
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056
Reason for revert: Causing bootloop with signed builds
Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056
Bug: 309117462
Change-Id: Ib09ea604351cea2c4ed40e64c0bf783a666eb08b
Test: Compiles, device boots up
|
2023-11-04 14:59:04 +00:00 |
|
Shin-Yu Wang
|
099bd7fd13
|
Update idle timer setting
Bug: 308140167
Test: check result of `adb shell getprop ro.surface_flinger.set_idle_timer_ms`
Change-Id: I873e69c385d787567a14427c007fa834c1a66062
|
2023-10-30 14:45:56 +00:00 |
|
Ankur Bakshi
|
dffbdd0b0f
|
Update felix SVN to 30
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:acd9c7a658123df92ee49b358b01bc5811911905)
Merged-In: Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359
Change-Id: Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359
|
2023-10-27 03:31:44 +00:00 |
|
Shivakumar Neginal
|
403b895a06
|
Adding Fast Pair extended IDs for F10
Adding the Fast Pair extended IDs for felix so that
Quick Start shows the right Fast Pair bottom sheet on other devices
during setup.
Bug: 305516133
Test: TBD
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9931ca082a643bd498f22cfa59d4d7954bce6e63)
Merged-In: Iec1e7b85e802e55b204d0bebfaf9c2f83ca588f2
Change-Id: Iec1e7b85e802e55b204d0bebfaf9c2f83ca588f2
|
2023-10-27 03:31:35 +00:00 |
|
Lokesh Kumar Goel
|
aa4d849349
|
Update felix SVN to 29
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0c650e810d598f67b21cb0f862c12c1d4fd68490)
Merged-In: Ia1f09da58824a8300e364bd3236fad0685ee5508
Change-Id: Ia1f09da58824a8300e364bd3236fad0685ee5508
|
2023-10-27 03:31:26 +00:00 |
|
Cyan Hsieh
|
684f06aee3
|
Merge "Split bootloader prebuilt to 24Q1 and trunk version" into main
|
2023-10-27 03:04:52 +00:00 |
|
Treehugger Robot
|
3292ed70fa
|
Merge "Update felix SVN to 30" into udc-qpr-dev am: 191a8f3462 am: e3dc31a837
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25181894
Change-Id: I2fcb6f1af1f25afdf69e0fc5e7e15149d384d220
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-10-27 02:49:48 +00:00 |
|
Treehugger Robot
|
e3dc31a837
|
Merge "Update felix SVN to 30" into udc-qpr-dev am: 191a8f3462
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25181894
Change-Id: I6750b4258a5a09ccd204444124d714889e8c8b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-10-27 02:18:52 +00:00 |
|
Treehugger Robot
|
191a8f3462
|
Merge "Update felix SVN to 30" into udc-qpr-dev
|
2023-10-27 01:46:44 +00:00 |
|
Treehugger Robot
|
125b612cb9
|
Merge " Adding Fast Pair extended IDs for F10" into udc-qpr-dev am: fb7ad6b67f am: 56658f374e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25063890
Change-Id: I59c11f6a03a8886b70b208bc7069a856e68b7834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-10-26 23:50:53 +00:00 |
|
Treehugger Robot
|
56658f374e
|
Merge " Adding Fast Pair extended IDs for F10" into udc-qpr-dev am: fb7ad6b67f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25063890
Change-Id: I31f08ca225e90d7f5cc32d01853ea3ea7904513d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-10-26 23:21:16 +00:00 |
|
Treehugger Robot
|
fb7ad6b67f
|
Merge " Adding Fast Pair extended IDs for F10" into udc-qpr-dev
|
2023-10-26 22:56:18 +00:00 |
|
Roshan Pius
|
f7dae2aa9d
|
felix(nfc): Modify NFC overlays for NFC apex am: 422f737c4b am: 0d481cf369 am: 445c61a269
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2804475
Change-Id: I84a650d23e538b51152760d4d920f604b399208e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-10-26 15:29:06 +00:00 |
|
Roshan Pius
|
445c61a269
|
felix(nfc): Modify NFC overlays for NFC apex am: 422f737c4b am: 0d481cf369
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2804475
Change-Id: Id71e1b49954336818bd05ab7bb78694ee5649257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-10-26 14:57:08 +00:00 |
|
Roshan Pius
|
0d481cf369
|
felix(nfc): Modify NFC overlays for NFC apex am: 422f737c4b
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2804475
Change-Id: Ifc7551059829f274a7dd34e8a97e5975aeae61b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-10-26 14:33:56 +00:00 |
|
Ankur Bakshi
|
acd9c7a658
|
Update felix SVN to 30
Bug: 302612466
Change-Id: Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359
|
2023-10-26 05:24:05 +00:00 |
|
Roshan Pius
|
422f737c4b
|
felix(nfc): Modify NFC overlays for NFC apex
Bug: 307763519
Test: Manual flash and tested the overlay values are taking effect.
Change-Id: I4c02990bf44fb5f8de360572f1b15ae6f70520ff
|
2023-10-26 04:06:11 +00:00 |
|
Lokesh Kumar Goel
|
f88a11aeaa
|
Update felix SVN to 29 am: 348ba30559 am: 32587a4efe
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24896431
Change-Id: Icdbb09445f6fd18e697d40f4b9fc026b31265ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-10-25 21:10:05 +00:00 |
|
Lokesh Kumar Goel
|
32587a4efe
|
Update felix SVN to 29 am: 348ba30559
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24896431
Change-Id: Idd044f1fe6aa43b11dfcb0f35b783cadbd97cb7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-10-25 20:42:53 +00:00 |
|