Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
761,253 Commits 3 Branches 0 Tags
64bc150794253dafedde8d0f5c46bb2722e82aa6
Commit Graph

761253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarah Chin
64bc150794 Merge "Update ServiceState broadcast for location permissions" into tm-dev am: dfada27e9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18214219

Change-Id: Ifbf84c4b2da833c7342d13199df12f9cff5ac92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:20:22 +00:00
Automerger Merge Worker
890f8e2a19 Merge "[automerger skipped] Merge "Fixed the incorrect APN dedupling" am: 25157d1128 am: d8a8bdbffa -s ours" into tm-dev-plus-aosp 2022-05-12 12:18:17 +00:00
Ruslan Tkhakokhov
3579acc6c7 Merge "Make BackupTransport more resilient" into tm-dev am: a3a657350a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18321342

Change-Id: Ib74951af818537abca1bc9e576b2ccccfa8c173b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:17:47 +00:00
Treehugger Robot
37e6f62d98 [automerger skipped] Merge "Fixed the incorrect APN dedupling" am: 25157d1128 am: d8a8bdbffa -s ours 
am skip reason: Merged-In I02190be62855f5f3b86c41677bbf7ff6a362e652 with SHA-1 1d470caabb is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2094528

Change-Id: Ibd6d343d5f80e56989762aaf4e4ae093ac5fa755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:17:40 +00:00
Automerger Merge Worker
88ae40687a Merge "Merge "Handle onActivityReparentToTask for activity in other process" into tm-dev am: 9b36cc92eb" into tm-dev-plus-aosp 2022-05-12 12:17:09 +00:00
Treehugger Robot
f57713a784 [automerger skipped] Merge "Added enhanced IWLAN handover check support" am: 0f603e1ffb am: 73292c7d8e -s ours 
am skip reason: Merged-In Iad41d4e8e23001b9c19a81edac04b1099e550f3e with SHA-1 72c2e8309b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2094527

Change-Id: Iaab371d3b98c7c4737a7e8d745743c8b6d3606cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:16:54 +00:00
Chris Li
812998e0d9 Merge "Handle onActivityReparentToTask for activity in other process" into tm-dev am: 9b36cc92eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17950644

Change-Id: I612180cacd685fd34c0f84564261d1a527b0edbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:16:48 +00:00
Treehugger Robot
d8a8bdbffa Merge "Fixed the incorrect APN dedupling" am: 25157d1128 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2094528

Change-Id: I6414d3128c22f72c35f59b3ec4caf85098bf7e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:16:28 +00:00
TreeHugger Robot
922aaf5588 Merge "Keystore: Wire up Ed25519 signing" into tm-dev am: e41f27bfc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281070

Change-Id: I111435ffa772a1a3c27998020d8caa1db430a1e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 12:15:13 +00:00
Treehugger Robot
25157d1128 Merge "Fixed the incorrect APN dedupling" 2022-05-12 10:57:00 +00:00
Sarah Chin
dfada27e9f Merge "Update ServiceState broadcast for location permissions" into tm-dev 2022-05-12 09:20:04 +00:00
Ruslan Tkhakokhov
a3a657350a Merge "Make BackupTransport more resilient" into tm-dev 2022-05-12 09:11:13 +00:00
Chris Li
9b36cc92eb Merge "Handle onActivityReparentToTask for activity in other process" into tm-dev 2022-05-12 09:02:49 +00:00
TreeHugger Robot
e41f27bfc8 Merge "Keystore: Wire up Ed25519 signing" into tm-dev 2022-05-12 08:49:58 +00:00
Treehugger Robot
73292c7d8e Merge "Added enhanced IWLAN handover check support" am: 0f603e1ffb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2094527

Change-Id: I5f9319b03103ff90286a88c1fdc869189827c125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 08:45:39 +00:00
Treehugger Robot
0f603e1ffb Merge "Added enhanced IWLAN handover check support" 2022-05-12 08:35:35 +00:00
Mariia Sandrikova
f5fc70b4c4 Merge "Clean up ADB commands for letterbox and display API sandboxing." into tm-dev am: 4b33be9fbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281173

Change-Id: I7609dfc9d6cd5e05cf64d9df87820c734a8900c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 08:00:44 +00:00
Mariia Sandrikova
4b33be9fbd Merge "Clean up ADB commands for letterbox and display API sandboxing." into tm-dev 2022-05-12 07:27:55 +00:00
Jack Yu
f419d33c6a Fixed the incorrect APN dedupling 
Fixed that APN settings can't be merged when one APN
entry has MTU set, but the other doesn't. Also default
MTU unset value to 0 for backwards compatability.

Test: atest DataProfileManagerTest & Manual testing
Fix: 226563054
Change-Id: I02190be62855f5f3b86c41677bbf7ff6a362e652
Merged-In: I02190be62855f5f3b86c41677bbf7ff6a362e652
 2022-05-12 00:27:19 -07:00
Jack Yu
98b6e1174d Added enhanced IWLAN handover check support 
Added enhanced IWLAN handover check support, where telephony
frameworks will not perform handover if the target transport
is out of service, or VoPS not supported. The network will be
torn down on the source transport, and re-established on the
target transport when condition is allowed for bringing up a
new network.

Fix: 229151428
Test: atest DataNetworkControllerTest & Sanity testing
Change-Id: Iad41d4e8e23001b9c19a81edac04b1099e550f3e
Merged-In: Iad41d4e8e23001b9c19a81edac04b1099e550f3e
 2022-05-12 00:05:58 -07:00
Shawn Lin
8e0cd33ae8 Merge "Fix cutout flicker while switch screen resolution" into tm-dev am: 842704d45a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18283848

Change-Id: I8279f28b96e4e18fff3888f765beb052ceb4d0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 07:04:15 +00:00
Chris Li
7222f49efd Merge "Fix visibility change during entering PIP app transition" into tm-dev am: 7284a6a981 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18309444

Change-Id: Iaaa9e1a08a9271c242f6fe33978d3df1e1ede240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 07:03:37 +00:00
Shawn Lin
842704d45a Merge "Fix cutout flicker while switch screen resolution" into tm-dev 2022-05-12 06:48:12 +00:00
Chris Li
7284a6a981 Merge "Fix visibility change during entering PIP app transition" into tm-dev 2022-05-12 06:38:50 +00:00
TreeHugger Robot
a73c1f487a [automerger skipped] Merge "Add excludedPackages parameter to broadcast" into sc-dev am: a44e416cfa -s ours am: d116cd379f -s ours am: 2439eb8be6 -s ours am: 4572849b0f -s ours 
am skip reason: Merged-In I9a331f71c7052b294d4eada0f0f658dba989d881 with SHA-1 c0ce69bc8d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18298311

Change-Id: I1d8c54531b1f561eb3cc4d71c7d35e4d1cba45d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 06:26:36 +00:00
Presubmit Automerger Backend
30c3fbd445 [automerger skipped] [automerge] Add excludedPackages parameter to broadcast 2p: c0ce69bc8d am: 884ef40058 am: e9fa10ef7a -s ours am: 8dd3929319 -s ours 
am skip reason: Merged-In I9a331f71c7052b294d4eada0f0f658dba989d881 with SHA-1 1968e5df71 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18298311

Change-Id: Icbb9effad68f0741bcaaddbec5d8cb79027a39e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 06:26:29 +00:00
TreeHugger Robot
4572849b0f [automerger skipped] Merge "Add excludedPackages parameter to broadcast" into sc-dev am: a44e416cfa -s ours am: d116cd379f -s ours am: 2439eb8be6 -s ours 
am skip reason: Merged-In I9a331f71c7052b294d4eada0f0f658dba989d881 with SHA-1 c0ce69bc8d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18298311

Change-Id: Ic52fcf120df71218f2bb8fc9d7bc5d1389336335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 05:43:08 +00:00
Presubmit Automerger Backend
8dd3929319 [automerger skipped] [automerge] Add excludedPackages parameter to broadcast 2p: c0ce69bc8d am: 884ef40058 am: e9fa10ef7a -s ours 
am skip reason: Merged-In I9a331f71c7052b294d4eada0f0f658dba989d881 with SHA-1 1968e5df71 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18298311

Change-Id: If3d1390ca9ba3d3a8a0b64a0487372a3afd73da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 05:42:45 +00:00
Colin Cross
d50e61dad2 Merge "Remove services/core/OWNERS" am: 4aa3ca3b8d am: 89b94d67a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2073338

Change-Id: I6934d8238c7b556fcf2c195159a42bda889834a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 05:35:34 +00:00
TreeHugger Robot
2439eb8be6 [automerger skipped] Merge "Add excludedPackages parameter to broadcast" into sc-dev am: a44e416cfa -s ours am: d116cd379f -s ours 
am skip reason: Merged-In I9a331f71c7052b294d4eada0f0f658dba989d881 with SHA-1 c0ce69bc8d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18298311

Change-Id: I04b64862a1932fa8605eebf6d696d04b08f77bcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 05:17:47 +00:00
Presubmit Automerger Backend
e9fa10ef7a [automerge] Add excludedPackages parameter to broadcast 2p: c0ce69bc8d am: 884ef40058 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18298311

Change-Id: I306cbbb71c88dd678cb297d9b1f0e980cbf3baa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 05:17:40 +00:00
TreeHugger Robot
d116cd379f [automerger skipped] Merge "Add excludedPackages parameter to broadcast" into sc-dev am: a44e416cfa -s ours 
am skip reason: Merged-In I9a331f71c7052b294d4eada0f0f658dba989d881 with SHA-1 c0ce69bc8d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18298311

Change-Id: I8297fc70d95222135ae4db696c6b690faced5a2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 05:17:26 +00:00
Jeff Chang
e7bf8962fd Merge "Fix security bug for startActivityInTaskFragment" into tm-dev am: bb452aa09f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18287504

Change-Id: I8629d53429790cbe70fbe442cc8a71a272205dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 05:09:29 +00:00
Jayant Chowdhary
e175e5cc09 Merge "android_media_Utils: update camera_jpeg_blob definition to match aidl." into tm-dev am: dc95eae46e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17915803

Change-Id: I10df57e38c3f9f343d9dc1d9a13a2341ac681020
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 05:08:26 +00:00
TreeHugger Robot
41afd5894f Merge "Clear liveData when startForRequest" into tm-dev am: 265b2c56ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18244408

Change-Id: Iaf66eecf624c64f4961a528ba3d7e86e9dd33771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 05:07:23 +00:00
Colin Cross
89b94d67a3 Merge "Remove services/core/OWNERS" am: 4aa3ca3b8d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2073338

Change-Id: Ie7a91ae07d7b9e25bdaedbfdf9b4d89d0bbace8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 05:07:18 +00:00
Jeff Chang
bb452aa09f Merge "Fix security bug for startActivityInTaskFragment" into tm-dev 2022-05-12 04:47:08 +00:00
TreeHugger Robot
a44e416cfa Merge "Add excludedPackages parameter to broadcast" into sc-dev 2022-05-12 04:39:14 +00:00
Jayant Chowdhary
dc95eae46e Merge "android_media_Utils: update camera_jpeg_blob definition to match aidl." into tm-dev 2022-05-12 04:16:57 +00:00
TreeHugger Robot
265b2c56ac Merge "Clear liveData when startForRequest" into tm-dev 2022-05-12 04:15:10 +00:00
Joshua Mccloskey
818a03bcbb Merge "ResetLockoutClients cancel preceding clients." into tm-dev am: fa8e422ffa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18309972

Change-Id: Ie82f75199dc11d8b39a8587787ae57bbd1ee1b87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 04:04:05 +00:00
Charles Chen
f4d5e63874 Merge "Fix starting window isn't removed" into tm-dev am: ce3c4be427 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282095

Change-Id: I971d71d9ccf35a64a722b4e88b48455cce35aec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 04:03:18 +00:00
Colin Cross
4aa3ca3b8d Merge "Remove services/core/OWNERS" 2022-05-12 04:02:45 +00:00
Joshua Mccloskey
fa8e422ffa Merge "ResetLockoutClients cancel preceding clients." into tm-dev 2022-05-12 03:40:31 +00:00
Charles Chen
ce3c4be427 Merge "Fix starting window isn't removed" into tm-dev 2022-05-12 03:39:28 +00:00
TreeHugger Robot
3e29e19973 [automerger skipped] Merge "Label emulator clipboards with SUPPRESS_CLIPBOARD_OVERLAY" into tm-dev am: c54118d1ea -s ours 
am skip reason: Merged-In I46323732a64202dabdd3a43bf17df7e7f3f9dd9c with SHA-1 f7a05bd2fa is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18306272

Change-Id: I16aec32fcac737b91574e4eb268b1e796ab5633a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:19:17 +00:00
Roman Kiryanov
b2d7335888 [automerger skipped] Label emulator clipboards with SUPPRESS_CLIPBOARD_OVERLAY am: b0ade8d3c8 -s ours 
am skip reason: Merged-In I46323732a64202dabdd3a43bf17df7e7f3f9dd9c with SHA-1 f7a05bd2fa is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18306272

Change-Id: I0e6be6167d202927d411d9e331dda814cd78fcec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:19:15 +00:00
Chris Li
238e0b32bb Handle onActivityReparentToTask for activity in other process 
1. Refactor onStartActivity so that we can reuse the same logic for
   onActivityReparentToTask. Also cleanup the logic there.
2. Besides the launching activity, check if the launched activity can be
   split with the top activities.

Bug: 225371112
Test: atest WMJetpackUnitTests:SplitControllerTest
Test: atest WMJetpackUnitTests:TaskContainerTest
Change-Id: I840766e4efaa4bdb9ec89cdca8b3c2c0bbe8cf8c
 2022-05-12 11:13:05 +08:00
Kyunglyul Hyun
8a949f8c32 [automerger skipped] Merge "Correct stream type for BLE input device" am: 2c7275d641 am: 41fa371e64 -s ours 
am skip reason: Merged-In I0dc289d9b670133928513aa5e5c1edd240351aef with SHA-1 961bc806e0 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2089446

Change-Id: Ic7957772d080d240f01345225468ec8136dabeda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:11:47 +00:00
Sarah Chin
99448eb2ae Update ServiceState broadcast for location permissions 
Add extra checks for master location switch and location bypass packages
and send broadcasts accordingly.

Test: Verify location is sanitized using testapp
Test: Verify privacy dashboard with MLS on/off
Test: Verify location is sanitized/unsanitized with bypass list
Bug: 230919427
Bug: 210118427
Change-Id: I9784527d6d79235830f562c1944562f5a6ac1fb3
Merged-In: I9784527d6d79235830f562c1944562f5a6ac1fb3
 2022-05-11 20:10:33 -07:00