Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
750,361 Commits 3 Branches 0 Tags
a85f33eecc0f01c9356ee0aa39a0440fc9b66155
Commit Graph

750361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elis Elliott
a85f33eecc Merge "Expose isRemovingAdmin in DevicePolicyManager as a TestApi." into tm-dev am: 0563d4fb32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17003109

Change-Id: Ic78a6b7764ea2f7dd07f1ac5190763bf9f9c456a
 2022-03-02 15:52:12 +00:00
Elis Elliott
0563d4fb32 Merge "Expose isRemovingAdmin in DevicePolicyManager as a TestApi." into tm-dev 2022-03-02 15:38:36 +00:00
Dave Mankoff
69bfcfcad5 Merge "Replace reflection with Suppliers." into tm-dev am: 7081ab5bff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17050003

Change-Id: Iaa1c82c80777a4a169e8b45e69404a111ad0e7b3
 2022-03-02 15:38:13 +00:00
Elis Elliott
b6d3083b06 Expose isRemovingAdmin in DevicePolicyManager as a TestApi. 
Fixes: 219894175

Test: android.devicepolicy.cts.DevicePolicyManagerTest#setAndRemoveDeviceOwnerRepeatedly_doesNotThrowError
Test: android.devicepolicy.cts.DevicePolicyManagerTest#setAndRemoveProfileOwnerRepeatedly_doesNotThrowError
Change-Id: Ifd9fc00878ce8243c0f34eca827b5a857ffc1b2f
 2022-03-02 15:37:38 +00:00
Dave Mankoff
7081ab5bff Merge "Replace reflection with Suppliers." into tm-dev 2022-03-02 15:14:38 +00:00
Riddle Hsu
9c637ef0c4 Merge "Unset last orientation for fixed orientation transient launch" into tm-dev am: 4fa92e4aec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045437

Change-Id: Ide87d355add05572a769c3bae21e4f73a0f59620
 2022-03-02 14:55:10 +00:00
Neil Fuller
9932a01842 Merge "Command-line interface: NetworkTimeUpdateService" am: 8ac370e63f am: 7b559562f7 am: f12a783920 am: 624a892191 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2002571

Change-Id: I1751aeb779bbf60f58909efa5e7ab4c359202bff
 2022-03-02 14:55:02 +00:00
Rubin Xu
02dada3a31 Merge "Fix inaccuracy in biometric timeout" am: 2f178de076 am: cf3c838d6d am: 27f0879140 am: ed6844ea22 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991781

Change-Id: Ib6719f9618657d8637960686c0f68fab0e043295
 2022-03-02 14:54:34 +00:00
Riddle Hsu
4fa92e4aec Merge "Unset last orientation for fixed orientation transient launch" into tm-dev 2022-03-02 14:45:41 +00:00
Neil Fuller
624a892191 Merge "Command-line interface: NetworkTimeUpdateService" am: 8ac370e63f am: 7b559562f7 am: f12a783920 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2002571

Change-Id: I4c7d0a18bece446ccc828acfd3e70d91d74e902e
 2022-03-02 14:35:26 +00:00
Rubin Xu
ed6844ea22 Merge "Fix inaccuracy in biometric timeout" am: 2f178de076 am: cf3c838d6d am: 27f0879140 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991781

Change-Id: I96f18a7eec73dfc63d05f5c220ff207662d193fd
 2022-03-02 14:34:46 +00:00
Neil Fuller
f12a783920 Merge "Command-line interface: NetworkTimeUpdateService" am: 8ac370e63f am: 7b559562f7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2002571

Change-Id: Ia2389b5e2018bc27a19e4a8bc057baaa37e544fe
 2022-03-02 14:11:14 +00:00
Rubin Xu
27f0879140 Merge "Fix inaccuracy in biometric timeout" am: 2f178de076 am: cf3c838d6d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991781

Change-Id: I5b3291aba3ffbf4d842127fc6655dba81a2cab91
 2022-03-02 14:10:54 +00:00
Pat Manning
b71f15b1f9 Merge "Refactor force visible nav bar into new secure setting." into tm-dev am: 60b397e84a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17002888

Change-Id: I36e8a2b87c990c23b0d743677c0963768b564941
 2022-03-02 14:10:11 +00:00
Frank Li
3d66524e8c [automerger skipped] Merge "[SUBID01-0]Grow NetworkIdentity to include a new mSubId field" am: 8e7b0f1a00 am: 6321029723 am: 215de9506b -s ours am: f426055509 -s ours 
am skip reason: Merged-In Ie1fe81006555dbcca4b62457fa6c319f04b4576d with SHA-1 c496554d12 is already in history

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

Change-Id: I85a61ca1b7be91533642d090e4c4422b38b0043e
 2022-03-02 14:09:50 +00:00
Pat Manning
60b397e84a Merge "Refactor force visible nav bar into new secure setting." into tm-dev 2022-03-02 13:51:27 +00:00
Neil Fuller
7b559562f7 Merge "Command-line interface: NetworkTimeUpdateService" am: 8ac370e63f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2002571

Change-Id: I1cb528ea3740f8ac54a30f79c4b9aeb7abb6b229
 2022-03-02 13:51:11 +00:00
Frank Li
f426055509 [automerger skipped] Merge "[SUBID01-0]Grow NetworkIdentity to include a new mSubId field" am: 8e7b0f1a00 am: 6321029723 am: 215de9506b -s ours 
am skip reason: Merged-In Ie1fe81006555dbcca4b62457fa6c319f04b4576d with SHA-1 c496554d12 is already in history

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

Change-Id: I192c1e015b65fbf1b8c6c1b7ed0fe7380600663d
 2022-03-02 13:50:15 +00:00
Rubin Xu
cf3c838d6d Merge "Fix inaccuracy in biometric timeout" am: 2f178de076 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991781

Change-Id: Icc2581bffaa49e085cc4e70182bab4b799bf7a24
 2022-03-02 13:49:59 +00:00
Neil Fuller
8ac370e63f Merge "Command-line interface: NetworkTimeUpdateService" 2022-03-02 13:46:14 +00:00
Beverly Tai
d8c7030dd3 Merge "DO NOT MERGE Don't re-animate duplicate biometric msgs" into tm-dev am: 2773ac9c72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17013660

Change-Id: If5750cc4d872656bbbc021a43a6acdccb755ca6e
 2022-03-02 13:37:50 +00:00
Beverly
2ae2b648ed DO NOT MERGE Don't re-animate duplicate biometric msgs am: 170fa31f93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17013660

Change-Id: Ie2daf3219b568486fcc3653d4d19b918ab4946b7
 2022-03-02 13:37:44 +00:00
Frank Li
215de9506b Merge "[SUBID01-0]Grow NetworkIdentity to include a new mSubId field" am: 8e7b0f1a00 am: 6321029723 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894970

Change-Id: I441a5bb32bcc491a9c6f8ec06823d4273c36fd72
 2022-03-02 13:28:16 +00:00
Rubin Xu
2f178de076 Merge "Fix inaccuracy in biometric timeout" 2022-03-02 13:28:08 +00:00
Beverly Tai
2773ac9c72 Merge "DO NOT MERGE Don't re-animate duplicate biometric msgs" into tm-dev 2022-03-02 13:13:31 +00:00
Frank Li
6321029723 Merge "[SUBID01-0]Grow NetworkIdentity to include a new mSubId field" am: 8e7b0f1a00 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894970

Change-Id: I8000c63c159d50d032853abb91723eab20da1e0a
 2022-03-02 12:55:30 +00:00
Tom Hsu
85c1f869c0 Merge "[Tethering] Add action of carrier unsupported dialog." am: 882c2864f3 am: 2d7c62078c am: ad1c6840bf am: dc231afd22 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1993171

Change-Id: I83ca97ec514ec1927ef673adc7d05150a1eea955
 2022-03-02 12:52:24 +00:00
Tom Hsu
dc231afd22 Merge "[Tethering] Add action of carrier unsupported dialog." am: 882c2864f3 am: 2d7c62078c am: ad1c6840bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1993171

Change-Id: I2fc0ee76ee6b68edb8141f6f2ab55b101ee82c7f
 2022-03-02 12:42:33 +00:00
Mark Renouf
c95bc88026 Merge "Simplify app prediction service check" into tm-dev am: 47821c98ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17015405

Change-Id: I22a5b5d940e0715aa996c9f1556b4e10ca12ee98
 2022-03-02 12:41:18 +00:00
Frank Li
8e7b0f1a00 Merge "[SUBID01-0]Grow NetworkIdentity to include a new mSubId field" 2022-03-02 12:26:11 +00:00
Mark Renouf
47821c98ee Merge "Simplify app prediction service check" into tm-dev 2022-03-02 12:24:24 +00:00
Tom Hsu
ad1c6840bf Merge "[Tethering] Add action of carrier unsupported dialog." am: 882c2864f3 am: 2d7c62078c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1993171

Change-Id: I83eafe6a7fa55bbd1811345328a06c328bcb9378
 2022-03-02 12:19:56 +00:00
Tom Hsu
2d7c62078c Merge "[Tethering] Add action of carrier unsupported dialog." am: 882c2864f3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1993171

Change-Id: I3eb65de95df14098d2b284c8d6a7bd9234a724f5
 2022-03-02 11:59:46 +00:00
Riddle Hsu
271edc361c Unset last orientation for fixed orientation transient launch 
The commit 7c6f6b8 uses the requested orientation. That is fine
if the next app has different requested orientation. But if the
next app is still the transient launch app itself, then no change
will be detected by DisplayRotation#updateOrientation, and then
the display stay in previous rotation.

Change to use UNSET so it is similar to force update for the next
time calling updateOrientation().

Bug: 216169338
Test: atest TransitionTests#testDeferRotationForTransientLaunch
Change-Id: Id467d1910b32d8699fb34e7fdc04c91c7b450c71
 2022-03-02 11:47:11 +00:00
Tom Hsu
882c2864f3 Merge "[Tethering] Add action of carrier unsupported dialog." 2022-03-02 11:28:50 +00:00
Sam Dubey
b37ee11c9d Merge "Revert "Fix shouldControlUnlockedScreenOff."" into tm-dev am: cc9e167538 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17053278

Change-Id: Ieee06931f63356458fd552369e5ae5cf957a78bc
 2022-03-02 11:01:18 +00:00
Sam Dubey
cc9e167538 Merge "Revert "Fix shouldControlUnlockedScreenOff."" into tm-dev 2022-03-02 10:54:22 +00:00
Oli Lan
56b2ed7040 Merge changes Idf1ab608,I70f3e8dc into tm-dev am: 8237b9422b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17005706

Change-Id: Idb124181e3d37e6e207fea0ff49efd496f1a786e
 2022-03-02 10:49:12 +00:00
Oli Lan
8237b9422b Merge changes Idf1ab608,I70f3e8dc into tm-dev 
* changes:
  Prevent exfiltration of system files via avatar picker.
  Add tests for AvatarPhotoController.
 2022-03-02 10:29:17 +00:00
Wei Sheng Shih
1046e93aa6 Merge "Waiting for snapshot layer gone for quick switch tests." into tm-dev am: 801c0b17ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17041347

Change-Id: I231fb7c8dd2b9fee8ef115d16a0412f3d72c35b6
 2022-03-02 09:45:12 +00:00
Wei Sheng Shih
801c0b17ac Merge "Waiting for snapshot layer gone for quick switch tests." into tm-dev 2022-03-02 09:37:13 +00:00
Frank Li
8e5adedf99 [automerger skipped] Merge "[DU03-4]Add NETWORK_STACK Permission check for NetworkStatsService API" am: 2da74e0820 am: 35278e3a9e am: b5bbf7fe84 -s ours am: 8e36cb9617 -s ours 
am skip reason: Merged-In I022c34b5af87fe3ff6857ea264bac2f7098eaed4 with SHA-1 ba76d15b9d is already in history

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

Change-Id: I3fbde6696603c645c3fa40656174ea308ba19f5b
 2022-03-02 09:23:12 +00:00
Frank Li
8e36cb9617 [automerger skipped] Merge "[DU03-4]Add NETWORK_STACK Permission check for NetworkStatsService API" am: 2da74e0820 am: 35278e3a9e am: b5bbf7fe84 -s ours 
am skip reason: Merged-In I022c34b5af87fe3ff6857ea264bac2f7098eaed4 with SHA-1 ba76d15b9d is already in history

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

Change-Id: Ic53c362943a8dfd8fb107d953f2dae9a14b2b5f6
 2022-03-02 09:14:20 +00:00
TreeHugger Robot
5b3e0f4a0f Merge "Enable Settings Search surfacing full screen for large screen" into tm-dev am: ad4f758572 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17047668

Change-Id: Ie892329650989426ace3f0c05c021769af951d37
 2022-03-02 09:13:24 +00:00
TreeHugger Robot
bba5028d33 Merge "Clean up the legacy split screen (6/n)" into tm-dev am: fafcf3c4e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16962007

Change-Id: I0cda1e6e1b52cadb38ef55b7f331ac1cdaf0cd08
 2022-03-02 09:12:41 +00:00
TreeHugger Robot
ad4f758572 Merge "Enable Settings Search surfacing full screen for large screen" into tm-dev 2022-03-02 08:52:49 +00:00
Frank Li
b5bbf7fe84 Merge "[DU03-4]Add NETWORK_STACK Permission check for NetworkStatsService API" am: 2da74e0820 am: 35278e3a9e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004530

Change-Id: I007e4ee328ffd93d00e77ce4d6894c6ee86f5b9f
 2022-03-02 08:51:51 +00:00
TreeHugger Robot
fafcf3c4e2 Merge "Clean up the legacy split screen (6/n)" into tm-dev 2022-03-02 08:50:47 +00:00
Sam Dubey
59af144bc4 Revert "Fix shouldControlUnlockedScreenOff." 
This reverts commit 7755d00cc5.

Reason for revert: Broke PlatformScenarioTests
Bug: 222015750

Change-Id: I38f9248ccce5bd73f45f4ee0cc0362f28388f92a
 2022-03-02 08:47:42 +00:00
Frank Li
35278e3a9e Merge "[DU03-4]Add NETWORK_STACK Permission check for NetworkStatsService API" am: 2da74e0820 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004530

Change-Id: I8808a5ae604d0533385e8200d7b06ef43017d21a
 2022-03-02 08:20:49 +00:00