Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
642,128 Commits 3 Branches 0 Tags
b0b4beb546858ee4671fd5715004db3504063df7
Commit Graph

642128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Abhijeet Kaur
b0b4beb546 Merge "Add ACCESS_MTP permission to Shell for CTS test coverage" into sc-dev am: 6d27ed1a3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14127232

Change-Id: I9094cdacf0e50b27d247a8cba26f9d36d8ed1406
 2021-04-14 15:04:59 +00:00
Abhijeet Kaur
6d27ed1a3b Merge "Add ACCESS_MTP permission to Shell for CTS test coverage" into sc-dev 2021-04-14 14:47:43 +00:00
Sean Stout
ec41369714 Merge "Fix race condition triggered by quick stop/start of Dream" into sc-dev am: 9692654a41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14129971

Change-Id: Iad471cfbfe1751bd5626a675d0ce3be629c9d502
 2021-04-14 14:41:08 +00:00
Sean Stout
9692654a41 Merge "Fix race condition triggered by quick stop/start of Dream" into sc-dev 2021-04-14 14:29:02 +00:00
Louis Chang
34fc9acd25 Merge "Move ActivityThreadTests to presubmit" into sc-dev am: 708d39e53e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14182412

Change-Id: I04b0e2808f668fa27f3621fc2694c2c2b7b82800
 2021-04-14 14:23:58 +00:00
Alex Johnston
3771a3be6d Merge "DPMS setDeviceOwner access control" into sc-dev am: 2052add72d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14161644

Change-Id: Ie241a40c3f1057969f69de16c6483b220d5ab98c
 2021-04-14 14:23:45 +00:00
Antoan Angelov
e48afe6e1b Merge "Update EXTRA_PROVISIONING_SUPPORTED_MODES values to flags" into sc-dev am: f78b620609 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14104346

Change-Id: I75ab5dccab92cb684b59358ab3de7eabde9d6dc4
 2021-04-14 14:23:28 +00:00
Tony Mak
c420dfdecf Merge "Notify TextClassifier an app is reading the clipboard" into sc-dev am: cf4076db0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14127235

Change-Id: I67fd7be09e02ce4d476679002068b13b1b2e60cd
 2021-04-14 14:23:10 +00:00
Kholoud Mohamed
5257c36d29 Merge "Fix bug in LockSettingsService" into sc-dev am: 3dca1466a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14127225

Change-Id: I81754e02ff97d35a1d48acf5fcb9f40bb2a8e116
 2021-04-14 14:22:56 +00:00
John Reck
5654512fa0 Merge "Fix a logspam" into sc-dev am: 31164bc1ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14174046

Change-Id: I0c63c45d9ed6907c1b77ca4ce7fd16503e174cd9
 2021-04-14 14:21:44 +00:00
Louis Chang
708d39e53e Merge "Move ActivityThreadTests to presubmit" into sc-dev 2021-04-14 14:13:40 +00:00
Alex Johnston
2052add72d Merge "DPMS setDeviceOwner access control" into sc-dev 2021-04-14 14:11:51 +00:00
Antoan Angelov
f78b620609 Merge "Update EXTRA_PROVISIONING_SUPPORTED_MODES values to flags" into sc-dev 2021-04-14 14:08:19 +00:00
Tony Mak
cf4076db0f Merge "Notify TextClassifier an app is reading the clipboard" into sc-dev 2021-04-14 13:57:43 +00:00
Kholoud Mohamed
3dca1466a0 Merge "Fix bug in LockSettingsService" into sc-dev 2021-04-14 13:54:38 +00:00
John Reck
31164bc1ec Merge "Fix a logspam" into sc-dev 2021-04-14 13:46:27 +00:00
Fabian Kozynski
32126a5e85 Merge "Match rounded corners in QSDetail and QSFooter" into sc-dev am: aaeacb8093 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14174947

Change-Id: I97d3a30135b7cf42b832f483c059ef08b3b67f13
 2021-04-14 13:33:00 +00:00
Jeff DeCew
3b0078c57e Merge "Clean up MessagingLayout notifications" into sc-dev am: 42cef834c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14106007

Change-Id: Idb03dffc18dfe460e3425a68b8037593745508e6
 2021-04-14 13:32:49 +00:00
Chalard Jean
7ed20d70dc Merge "Use filter from CollectionUtils." into sc-dev am: ea9249446a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14125157

Change-Id: I475d0d43e1c2f4fcaff9cd0b7fdff8b93b880f70
 2021-04-14 13:32:19 +00:00
Fabian Kozynski
aaeacb8093 Merge "Match rounded corners in QSDetail and QSFooter" into sc-dev 2021-04-14 13:09:26 +00:00
Jeff DeCew
42cef834c7 Merge "Clean up MessagingLayout notifications" into sc-dev 2021-04-14 12:47:24 +00:00
Chalard Jean
ea9249446a Merge "Use filter from CollectionUtils." into sc-dev 2021-04-14 12:38:01 +00:00
Yan Han
e2aca0ee46 Merge "Don't update volume in AudioService when SAM is on and ARC is off" into sc-dev am: 4f5a1176d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14103505

Change-Id: Ia8893800bcca9d9cf0cfb14a6e2174496313d12b
 2021-04-14 11:53:53 +00:00
Anton Hansson
d6e70bc783 [automerger skipped] Merge "Inline usage of jarjar_rules.txt" am: c6a0cddfab am: 774da343c6 am: ad986df778 -s ours am: f63b7f0501 -s ours 
am skip reason: skip tag Change-Id Idef6f2fd89116490c43427bba55202f46377a83d with SHA-1 9c74c744fc is already in history

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

Change-Id: I80b5f1d0d7428fc6fdb3fdab103a18960b0181a4
 2021-04-14 11:53:37 +00:00
Yan Han
4f5a1176d7 Merge "Don't update volume in AudioService when SAM is on and ARC is off" into sc-dev 2021-04-14 11:47:42 +00:00
Anton Hansson
f63b7f0501 [automerger skipped] Merge "Inline usage of jarjar_rules.txt" am: c6a0cddfab am: 774da343c6 am: ad986df778 -s ours 
am skip reason: skip tag Change-Id Idef6f2fd89116490c43427bba55202f46377a83d with SHA-1 9c74c744fc is already in history

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

Change-Id: Ice6855b8b985465ff1657fed66f9029fcf57a48d
 2021-04-14 11:16:31 +00:00
Anton Hansson
ad986df778 Merge "Inline usage of jarjar_rules.txt" am: c6a0cddfab am: 774da343c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673391

Change-Id: Ib95e1f34d7fa382d05c6e191ddb021b5bf5dad3c
 2021-04-14 10:51:40 +00:00
Matt Pietal
fcf9d21b64 Merge "Smartspace - Align large clock" into sc-dev am: 1233b55e1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14164822

Change-Id: I22ab2c4da1c271cf1cb889aa93d97db67c672341
 2021-04-14 10:51:08 +00:00
Matt Pietal
1233b55e1e Merge "Smartspace - Align large clock" into sc-dev 2021-04-14 10:34:57 +00:00
Issei Suzuki
ea0436effe Merge "Wait OCCLUDE transition until screen turning on activity becomes ready." into sc-dev am: fa2ddbe2ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14127230

Change-Id: I51558d842e83078ac85f798320557d7f195273cb
 2021-04-14 10:29:45 +00:00
Pavel Grafov
9935f339a1 Merge "API review: change getKeyPairGrants return type" into sc-dev am: 7ecbda5d91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14141489

Change-Id: If601fbd2a5b1c0fa6a670f17a7e60ba0298ae3b0
 2021-04-14 10:29:29 +00:00
Issei Suzuki
07a8766f96 Merge "Let keyguard (un)occlude animation run even when no activity exists." into sc-dev am: 8560c1c2b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13988960

Change-Id: Ic3edec9de730b4198085230e24d5bf669229f945
 2021-04-14 10:28:35 +00:00
Anton Hansson
774da343c6 Merge "Inline usage of jarjar_rules.txt" am: c6a0cddfab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673391

Change-Id: I1b320ba1c7332b1126843c106ed6f5452e98472a
 2021-04-14 10:10:47 +00:00
Issei Suzuki
fa2ddbe2ef Merge "Wait OCCLUDE transition until screen turning on activity becomes ready." into sc-dev 2021-04-14 10:00:02 +00:00
Pavel Grafov
7ecbda5d91 Merge "API review: change getKeyPairGrants return type" into sc-dev 2021-04-14 09:58:49 +00:00
Alex Johnston
c40355f469 DPMS setDeviceOwner access control 
* Check whether the caller is system or has
  permission to set the device owner before
  checking whether the package exists on
  device.

Manual testing
* Call DPMS setDeviceOwner with an installed
  package but not as the system caller
* Call DPMS setDeviceOwner with an uninstalled
  package and not as the system caller
* Both calls should give the same error message
  and logs.

Bug: 184525740
Test: manual testing
      atest com.android.server.devicepolicy.DevicePolicyManagerTest
      atest com.android.cts.devicepolicy.DeviceOwnerTest
Change-Id: I5654ef420ff44af01d475595609bb85fec132ce1
 2021-04-14 09:52:11 +00:00
Issei Suzuki
8560c1c2b1 Merge "Let keyguard (un)occlude animation run even when no activity exists." into sc-dev 2021-04-14 09:50:32 +00:00
Anton Hansson
c6a0cddfab Merge "Inline usage of jarjar_rules.txt" 2021-04-14 09:45:00 +00:00
Shan Huang
9327ef1a15 Merge "Set charging animation windows as trusted overlays so that touches can pass through." into sc-dev am: 10cbd1f1e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14174192

Change-Id: I24d680e0eef920c40822e9f0d2150078b1488bac
 2021-04-14 09:24:21 +00:00
Shan Huang
681b4ef5e6 Merge "Fix a bug that ripple might get readded to WM and cause crash." into sc-dev am: d7217299a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14174191

Change-Id: I534fb2ebc9c6a9be1f930c14cbf5f6918f023f21
 2021-04-14 09:23:53 +00:00
Nataniel Borges
e09c1ec9cb Merge changes from topics "3button-runner", "re-enable-flicker" into sc-dev am: 6788d2b5d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14160125

Change-Id: I74ce7d3ce179f4d35f833d0a2dc2ad07975226ec
 2021-04-14 09:23:41 +00:00
Nataniel Borges
975a2c6234 Fix use of NavigationModeRule on flicker am: e852b071ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14049125

Change-Id: Ie527d010cad5e8c5cbbca58c2750141337cf03b8
 2021-04-14 09:23:38 +00:00
Shan Huang
10cbd1f1e5 Merge "Set charging animation windows as trusted overlays so that touches can pass through." into sc-dev 2021-04-14 09:12:50 +00:00
Shan Huang
d7217299a7 Merge "Fix a bug that ripple might get readded to WM and cause crash." into sc-dev 2021-04-14 09:11:53 +00:00
Nataniel Borges
6788d2b5d6 Merge changes from topics "3button-runner", "re-enable-flicker" into sc-dev 
* changes:
  Disable some trace assertions
  Fix use of NavigationModeRule on flicker
 2021-04-14 08:35:07 +00:00
TYM Tsai
4ff60ab1b1 Merge "Fallback to the default platform password manager" into sc-dev am: f379c17e98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14018527

Change-Id: I327ce58a36acc5328c78b571752db244a480f74b
 2021-04-14 08:17:09 +00:00
Tianjie Xu
50016559a3 Merge "Improve the error handling for armRebootEscrow" am: 246c14d6da am: cd4836d197 am: f3bde71026 am: 9bf277f905 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649651

Change-Id: I77608efd2e11b359da3687048285c8e7bfbb9169
 2021-04-14 08:16:43 +00:00
Louis Chang
a0f189ff0a Move ActivityThreadTests to presubmit 
Also fix two tests due to recent changes.
- Not reporting #onConfigurationChanges for window configuration
  changes after 13816978
- Not reporting #onConfigurationChanges for same configuration bucket
  after 13844692

Bug: 169550676
Test: atest ActivityThreadTests
Change-Id: Ia9dbf0f92716619d701acd8dec3478cc17cddee3
 2021-04-14 15:56:32 +08:00
TYM Tsai
f379c17e98 Merge "Fallback to the default platform password manager" into sc-dev 2021-04-14 07:45:16 +00:00
Bill Yi
ee26ec181c [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 8e90abbe39 -s ours am: b67a5b50fa -s ours am: d4aa3fc310 -s ours am: 9b4ec0cd60 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a78302d9356077442675cbd512eab75ee5ba2fc
 2021-04-14 07:30:18 +00:00