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

2602 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ankur Bakshi
52e1d2e397 Update felix SVN to 36 am: 6df29a10cc 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25617999

Change-Id: Ifd2eb8cd86df4de575d8a29c117e1a1c66b6e150
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 00:14:17 +00:00
Treehugger Robot
ab7f3aaf73 Merge "Revert^2 "felix: Replace NFC app with NFC apex"" into main am: f9a52d87c5 am: 538d828d21 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2863566

Change-Id: I9c551a4e1b0124759e506413007f8a899fe9d771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:40:09 +00:00
Treehugger Robot
0d6c4c192f Merge "Revert^2 "felix(nfc): Modify NFC overlays for NFC apex"" into main am: 23daae5cb5 am: 6b6955ca71 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2863471

Change-Id: I293133ec8f6074296c686bb574d7fb7da2974492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:40:03 +00:00
Treehugger Robot
538d828d21 Merge "Revert^2 "felix: Replace NFC app with NFC apex"" into main am: f9a52d87c5 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2863566

Change-Id: I5e83b610bcba6efca110e5248febe30b65632fa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:18:14 +00:00
Treehugger Robot
6b6955ca71 Merge "Revert^2 "felix(nfc): Modify NFC overlays for NFC apex"" into main am: 23daae5cb5 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2863471

Change-Id: I41b5bb422defa4dabd31bf006b8e6ae2e1c06edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:18:08 +00:00
Xin Li
2bab03a3ff [automerger skipped] Merge Android 14 QPR1 am: 0afb677cfc -s ours am: de0aacb8eb -s ours 
am skip reason: Merged-In I93f5517088b4d09d9e241b2d3b4e9c4d26a24934 with SHA-1 fb14bb624a is already in history

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

Change-Id: Ibab1a882853afb16de1d5b972c04416bdf0ff2ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:02:21 +00:00
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
de0aacb8eb [automerger skipped] Merge Android 14 QPR1 am: 0afb677cfc -s ours 
am skip reason: Merged-In I93f5517088b4d09d9e241b2d3b4e9c4d26a24934 with SHA-1 fb14bb624a is already in history

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

Change-Id: I56849a79858ea832dddfb296c2b5a49e203f2a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 21:16:31 +00:00
Ankur Bakshi
6df29a10cc Update felix SVN to 36 
Bug: 313797924
Change-Id: I899429fe04a85e1967a913d4887f9528b4f162d9
 2023-12-11 20:11:46 +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
0686c05e18 [automerger skipped] Merge UQ1A.231205.015 am: fb14bb624a -s ours 
am skip reason: Merged-In Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359 with SHA-1 acd9c7a658 is already in history

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

Change-Id: I687bf581e1fff8f710705ab2038be58cb99f7c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 08:21:14 +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
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
Treehugger Robot
5e6f781aee Merge "Remove unused Android.mk under device/google/felix am: 1890f3cb8b am: 905e71e645" into udc-qpr-dev-plus-aosp 2023-11-21 03:25:37 +00:00
Herbert Xue
b1d262f103 Remove unused Android.mk under device/google/felix am: 1890f3cb8b am: be68db3120 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2835912

Change-Id: Ibe6badf4390c8bc299596cc8e9eaad5c74c2ab8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-21 02:43:50 +00:00
Herbert Xue
4e93f60c8f Remove unused Android.mk under device/google/felix am: 1890f3cb8b am: 905e71e645 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2835912

Change-Id: I3a39eec5e7136ace54e6cc4f137011ee5678e3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-20 03:55:01 +00:00
Herbert Xue
be68db3120 Remove unused Android.mk under device/google/felix am: 1890f3cb8b 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2835912

Change-Id: Iad4487b4e81c72a8bb6893446448b10e679186a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-20 03:24:05 +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
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
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
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
5212a1d557 Merge changes from topic "nfc_apex_revert" into main am: 4bc515224b am: 9592292e98 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2817310

Change-Id: I067d5c92de21e61324d3b44b8e72873933f442cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 22:48:53 +00:00
Roshan Pius
36e918a183 Revert "felix(nfc): Modify NFC overlays for NFC apex" am: 98699d7fb9 am: 20494a566f 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2818128

Change-Id: Ice9e7b7eede7c2af4b4aba9541e420fe1b57425e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 22:48:38 +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
9592292e98 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: If1f2f8599e26dea854aa515568430001f7a77699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 21:49:01 +00:00
Roshan Pius
20494a566f 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: If410b9437051e4281818fc444d433234f12707da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 21:48:51 +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
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
14776220a7 [automerger skipped] Fix lunch choices for git_main am: eecbe76392 am: 7a361e0fde -s ours 
am skip reason: Merged-In I441fde351191dfa28e48a54538249be57310971f with SHA-1 eecbe76392 is already in history

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

Change-Id: Ia82b990136329eb125d8e8fab292507c671ad4fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 00:06:42 +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
152117510d Fix lunch choices for git_main am: eecbe76392 am: e1145ed773 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2809728

Change-Id: I442166cfcb7e3855ec38d2524cf5fb6cfe95049b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 23:37:19 +00:00
Greg Kaiser
e1145ed773 Fix lunch choices for git_main am: eecbe76392 
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2809728

Change-Id: I5272a3c8c148b21b0a6e835d0653367349b3cb9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 23:10:18 +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