Evolution-X-Tensor/device_google_felix
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2541 commits 1 branch 0 tags 122 MiB
Commit graph

2541 commits

This branch
This branch
All branches
Author SHA1 Message Date
Treehugger Robot
f9a52d87c5 Merge "Revert^2 "felix: Replace NFC app with NFC apex"" into main 2023-12-11 22:00:34 +00:00
Treehugger Robot
23daae5cb5 Merge "Revert^2 "felix(nfc): Modify NFC overlays for NFC apex"" into main 2023-12-11 22:00:34 +00:00
Xin Li
0afb677cfc Merge Android 14 QPR1 
Merged-In: I93f5517088b4d09d9e241b2d3b4e9c4d26a24934
Bug: 315507370
Change-Id: I5f517da20906eff45b3446722b855b79c716616d
 2023-12-08 13:13:16 -08: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
Herbert Xue
905e71e645 Remove unused Android.mk under device/google/felix am: 1890f3cb8b 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2835912

Change-Id: Ia2da9795fd437e3ed81b45730f9163391017f2f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-20 03:23:53 +00:00
Herbert Xue
1890f3cb8b Remove unused Android.mk under device/google/felix 
Bug: 311516793
Test: NA
Change-Id: Ic22d3796ae71a86e6ea2a0a732603bb505b84fab
 2023-11-17 11:40:58 +08: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
Roshan Pius
4bc515224b Merge changes from topic "nfc_apex_revert" into main 
* changes:
  Revert "felix: Replace NFC app with NFC apex"
  Revert "felix(nfc): Modify NFC overlays for NFC apex"
 2023-11-08 21:16:20 +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
Greg Kaiser
7a361e0fde Fix lunch choices for git_main am: eecbe76392 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2809728

Change-Id: Iff4614a102fb82f92203b7838976577554f4c055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 23:42:15 +00:00
Greg Kaiser
eecbe76392 Fix lunch choices for git_main 
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are
valid in the trunk stable setup.

Bug: 307738446
Test: lunch
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2d13c2fd2bbc1164beca59490ca0f1c88c25a256)
Merged-In: I441fde351191dfa28e48a54538249be57310971f
Change-Id: I441fde351191dfa28e48a54538249be57310971f
 2023-10-30 22:00:32 +00:00
Android Build Coastguard Worker
1c069c5ccd Merge cherrypicks of ['googleplex-android-review.googlesource.com/25176955', 'googleplex-android-review.googlesource.com/25063890', 'googleplex-android-review.googlesource.com/25181894'] into udc-qpr1-release. 
Change-Id: I723e6b90de0086e165cef0e5f7ca0fe202bc0e61
 2023-10-27 03:36:03 +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
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
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
Xin Li
aca659d22b Merge 10952656 
Merged-In: I220f48a43df9002d783951055ecc0e07427c7afa
Change-Id: I05ee5b22c2850b609c38c88da98dfcaff66e128f
 2023-10-17 10:06:18 -07:00
Android Build Coastguard Worker
3a08687c0f Merge cherrypicks of ['googleplex-android-review.googlesource.com/24896430'] into udc-qpr1-release. 
Change-Id: I6b4ad117155e876daf81df0d93cad19dab9ef126
 2023-10-17 02:45:27 +00:00
Lokesh Kumar Goel
f5a0584db7 Update felix SVN to 28 
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0804c4be4d794661f56a24f23970c05a3b671097)
Merged-In: If52eb638b160fd202e0511f6213fa5c5bce4975e
Change-Id: If52eb638b160fd202e0511f6213fa5c5bce4975e
 2023-10-17 02:41:02 +00:00
Roshan Pius
cda6224f59 Merge "felix: Replace NFC app with NFC apex" into main am: 996129be91 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2779568

Change-Id: I85de99093656327267c1fd25539a4c4b227f7104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 19:15:53 +00:00
Roshan Pius
996129be91 Merge "felix: Replace NFC app with NFC apex" into main 2023-10-16 18:31:03 +00:00
Roshan Pius
4e94c7642a felix: Replace NFC app with NFC apex 
Bug: 303286040
Test: Compiles
Merged-In: I9ae8d7630d18075b8620997582761787af1a65b4
Change-Id: I9ae8d7630d18075b8620997582761787af1a65b4
 2023-10-13 18:05:54 +00:00
Cole Faust
ab6e33ccea Use PRODUCT_COPY_FILES to install uwb country files am: 4e3ea6e815 am: 96d360a576 am: 337debd3fd am: 4d31ff02c2 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2777909

Change-Id: I220f48a43df9002d783951055ecc0e07427c7afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-11 19:47:19 +00:00
Cole Faust
4d31ff02c2 Use PRODUCT_COPY_FILES to install uwb country files am: 4e3ea6e815 am: 96d360a576 am: 337debd3fd 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2777909

Change-Id: I6dcdc3421c8d445697781858e0184333adcac851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-11 19:13:07 +00:00
Cole Faust
337debd3fd Use PRODUCT_COPY_FILES to install uwb country files am: 4e3ea6e815 am: 96d360a576 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2777909

Change-Id: I315544b444a54358c14d51f5310b1e7405a86cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-11 18:17:37 +00:00
Cole Faust
96d360a576 Use PRODUCT_COPY_FILES to install uwb country files am: 4e3ea6e815 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2777909

Change-Id: I614b9bbbaf2fad2a28a6f4f5182fc70b7f0421d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-11 17:45:51 +00:00
Cole Faust
4e3ea6e815 Use PRODUCT_COPY_FILES to install uwb country files 
Previously, these files were installed with a custom $(shell) command
in an Android.mk file. This doesn't let the build system know that
these files exist, and breaks hermetic partition builds.

Instead, install them with PRODUCT_COPY_FILES, and add a check that
the list is up-to-date.

Bug: 205632228
Test: Presubmits
Change-Id: Id43164ae2a106d6d384cd90b2f4191e53b3d34da
 2023-10-06 15:05:07 -07:00
Xin Li
fe8575d1cf [automerger skipped] Merge Android 14 am: 1fba35369d -s ours am: 5139499d27 -s ours am: 8a40eef5f4 -s ours am: 441255f85a -s ours 
am skip reason: Merged-In Ia42c74a3fab73b984823796b61b0e66f7662ac53 with SHA-1 db6cb71439 is already in history

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

Change-Id: I7c3d75a86469da2657f69a42e7780ff3003a3624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 11:00:49 +00:00
Xin Li
441255f85a [automerger skipped] Merge Android 14 am: 1fba35369d -s ours am: 5139499d27 -s ours am: 8a40eef5f4 -s ours 
am skip reason: Merged-In Ia42c74a3fab73b984823796b61b0e66f7662ac53 with SHA-1 db6cb71439 is already in history

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

Change-Id: Id8a78439c2bc1fb54c693a6e7ee4e7a016e2ebe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:50:59 +00:00
Xin Li
8a40eef5f4 [automerger skipped] Merge Android 14 am: 1fba35369d -s ours am: 5139499d27 -s ours 
am skip reason: Merged-In Ia42c74a3fab73b984823796b61b0e66f7662ac53 with SHA-1 db6cb71439 is already in history

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

Change-Id: I2669428832c896012bbf2dcaceb950a69c9402f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 08:59:23 +00:00
Xin Li
5139499d27 [automerger skipped] Merge Android 14 am: 1fba35369d -s ours 
am skip reason: Merged-In Ia42c74a3fab73b984823796b61b0e66f7662ac53 with SHA-1 db6cb71439 is already in history

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

Change-Id: I81d5e347e4cf057faa89f4158a437b4e089d79b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 07:52:18 +00:00
Xin Li
1fba35369d Merge Android 14 
Bug: 298295554
Merged-In: Ia42c74a3fab73b984823796b61b0e66f7662ac53
Change-Id: I08cb8a2b2050c04b370de78fd0d422730cc60171
 2023-10-05 15:33:08 -07:00
Xin Li
5dd8a3c959 [automerger skipped] Merge UP1A.231005.007 am: 08f3aa6503 -s ours am: 057645d3b3 -s ours am: c9449d8452 -s ours 
am skip reason: Merged-In I8bd0f5ef94ca1d5e118a701a4cfff58599537476 with SHA-1 f538f8e771 is already in history

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

Change-Id: I71c4a1ccf0f3b80b7daffe538941a7b9750a81ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 09:04:30 +00:00
Xin Li
c9449d8452 [automerger skipped] Merge UP1A.231005.007 am: 08f3aa6503 -s ours am: 057645d3b3 -s ours 
am skip reason: Merged-In I8bd0f5ef94ca1d5e118a701a4cfff58599537476 with SHA-1 f538f8e771 is already in history

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

Change-Id: I9237d98f2cef3b1b8473df6c2cda076e136fbe25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 08:16:27 +00:00
Xin Li
057645d3b3 [automerger skipped] Merge UP1A.231005.007 am: 08f3aa6503 -s ours 
am skip reason: Merged-In I8bd0f5ef94ca1d5e118a701a4cfff58599537476 with SHA-1 f538f8e771 is already in history

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

Change-Id: Ief63652d08a62e5a17c4639a02af59a53483d5c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 07:15:38 +00:00
Xin Li
08f3aa6503 Merge UP1A.231005.007 
Bug: 291102124
Merged-In: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
Change-Id: I218ff755949e928013808486639b33d81dde763b
 2023-09-27 16:04:17 -07:00
Wilson Sung
5d4ec22ab3 Set the blew prebuilt apps to PRESIGNED am: db6cb71439 am: f05ee3a530 am: e54620d2a2 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24843850

Change-Id: I6c5cbf858264149dfd1586c6932b755903b6a4b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 23:28:12 +00:00
Wilson Sung
e54620d2a2 Set the blew prebuilt apps to PRESIGNED am: db6cb71439 am: f05ee3a530 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24843850

Change-Id: I13f6533c404693a23e097f0aaa6b18394593e165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 22:47:04 +00:00
Wilson Sung
f05ee3a530 Set the blew prebuilt apps to PRESIGNED am: db6cb71439 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24843850

Change-Id: I012bdf5492f7b39fcee2bd4141731e2303abcb70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 21:54:20 +00:00
Wilson Sung
db6cb71439 Set the blew prebuilt apps to PRESIGNED 
Keep PixelQualifiedNetworksService platfrom key
Other apps are no need to re-sign

Bug: 290766628
Change-Id: Ia42c74a3fab73b984823796b61b0e66f7662ac53
 2023-09-23 03:37:58 +00:00
Android Build Coastguard Worker
0ef948d3a3 Snap for 10844344 from db7dfb48cc to udc-qpr1-release 
Change-Id: I5e5368e9e4f2ffeb83391e15b8cd6f12f4dc3e1f
 2023-09-21 23:02:21 +00:00
Sherry Zhou
b9e7af3e6a Change the translationY for smartspace in Felix on lockscreen am: db7dfb48cc 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24762778

Change-Id: Iaecad471d5e4019d24cf06be9035c0d841457d5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 19:33:46 +00:00
Android Build Coastguard Worker
5a83deb442 Snap for 10838116 from 84b043b65b to udc-qpr1-release 
Change-Id: Ie012d095960fbb16050747bc101a576625e1f4b8
 2023-09-20 23:02:58 +00:00
Sherry Zhou
db7dfb48cc Change the translationY for smartspace in Felix on lockscreen 
Bug: 299034855
Test: manual test on Felix
Change-Id: Ieee20f807ab8727dbbcb374a1e77e774ea1a05c0
 2023-09-20 17:01:22 +00:00
dshivangi
a3d2732af4 Disable Fold lock behavior setting in UQPR1 am: 84b043b65b 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24657714

Change-Id: I71d4fcdfa0936ed5f7ead2fe4565ebbc592b5ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 11:22:53 +00:00