Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
562,790 Commits 3 Branches 0 Tags
716e202e57bfc3382ea033899b32430d81cdf8be
Commit Graph

562790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
716e202e57 Merge "Add an OWNERS file for location tz detection code" am: 205894f2af am: 95d9ae065e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541670

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb80d0aed953ba0258682b86bff2af87722d68ea
 2021-01-06 19:55:38 +00:00
Quang Luong
21b3306247 Merge "Add wifi coex permissions to Shell for CTS tests" am: c7dfd602ee am: 50b86c5fb3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532972

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I148fffadc82704d4f4c508f880c2a39fe7e37f89
 2021-01-06 19:55:22 +00:00
Janis Danisevskis
deb3fc814c Merge "Keystore 2.0: Fix wrong exception returned on not authenticated." am: 89ec9d42d9 am: 70f3932f23 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0e521aa1402dabfe6be5818d1203a703067ce29
 2021-01-06 19:54:53 +00:00
Treehugger Robot
95d9ae065e Merge "Add an OWNERS file for location tz detection code" am: 205894f2af 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541670

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If396e46e9193714f4626cf353f2b6773a17d0ec0
 2021-01-06 19:19:37 +00:00
Treehugger Robot
205894f2af Merge "Add an OWNERS file for location tz detection code" 2021-01-06 19:18:02 +00:00
Quang Luong
50b86c5fb3 Merge "Add wifi coex permissions to Shell for CTS tests" am: c7dfd602ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532972

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a6a58cd569f7e6cf4ce2c6e5502c8fd0df55c3f
 2021-01-06 19:16:40 +00:00
Janis Danisevskis
70f3932f23 Merge "Keystore 2.0: Fix wrong exception returned on not authenticated." am: 89ec9d42d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21d059008c3a6a0ae1444d4572b4d0b6d39d254c
 2021-01-06 19:12:23 +00:00
Quang Luong
c7dfd602ee Merge "Add wifi coex permissions to Shell for CTS tests" 2021-01-06 19:08:24 +00:00
Janis Danisevskis
89ec9d42d9 Merge "Keystore 2.0: Fix wrong exception returned on not authenticated." 2021-01-06 18:44:50 +00:00
Benjamin Schwartz
f5c637719f Merge "BatteryStatsService: Allow unknown wakeup string" am: 754d78cb7d am: 32ae89039f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531984

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I870f28416bdf80a7ee2b725b9ab31a0b503ce181
 2021-01-06 18:42:05 +00:00
Janis Danisevskis
2e494c0577 Keystore 2.0: Fix wrong exception returned on not authenticated. 
Test: CtsVerifier fingerprint bound key test.
Change-Id: I0aa897455b88d7a709e4de6b515eef43bc15d053
 2021-01-06 10:23:30 -08:00
Benjamin Schwartz
32ae89039f Merge "BatteryStatsService: Allow unknown wakeup string" am: 754d78cb7d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531984

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04cd90efb331c4dbbf4309163e710951e660dfa1
 2021-01-06 17:50:11 +00:00
TreeHugger Robot
9858b561b1 Merge "[RESTRICT AUTOMERGE] Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser" into rvc-qpr-dev am: a428448b1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12977405

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie31572027b89b567d04bad4bbcc41e28d8c9c901
 2021-01-06 17:31:24 +00:00
arangelov
f5a379201d [RESTRICT AUTOMERGE] Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser am: 10f79644fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12977405

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I162d5c8dd07adab106ba7c4201d984d98854e111
 2021-01-06 17:31:09 +00:00
Beth Thibodeau
246bde6bf3 Merge "Use default color when artwork is too small" into rvc-qpr-dev am: 6ae71ece49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13287026

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d139c24f7383d3cb6751ded3a7a78d91555ff89
 2021-01-06 17:29:59 +00:00
Benjamin Schwartz
754d78cb7d Merge "BatteryStatsService: Allow unknown wakeup string" 2021-01-06 17:28:21 +00:00
TreeHugger Robot
a428448b1e Merge "[RESTRICT AUTOMERGE] Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser" into rvc-qpr-dev 2021-01-06 17:21:50 +00:00
Beth Thibodeau
6ae71ece49 Merge "Use default color when artwork is too small" into rvc-qpr-dev 2021-01-06 17:06:44 +00:00
Neil Fuller
26c036bb3a Add an OWNERS file for location tz detection code 
Another OWNERS file for location tz detection code.

Test: treehugger only
Change-Id: Ic4f7031330a7bb8da343c8274cf385af49c68d0e
 2021-01-06 16:17:11 +00:00
James Mattis
4a1a9748f0 Merge "Update to Diagnostic Callback flows for multilayer" am: 3b75f7a8e9 am: ea848623c9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510596

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3e2d2130c14af20fb422f6c7ebcccb36618dfac
 2021-01-06 16:08:25 +00:00
TreeHugger Robot
dd68beb94f Merge "[RESTRICT AUTOMERGE] Make WPMS look for DOs and POs in the correct calling user" into rvc-qpr-dev am: b8e8fe89e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13144052

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I478609b9b9b97c26eafe9676335cbcb42a0e9683
 2021-01-06 16:00:56 +00:00
Alex Kershaw
fb688b44d8 [RESTRICT AUTOMERGE] Make WPMS look for DOs and POs in the correct calling user am: 72704403aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13144052

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9fa890f6b0582997173c9cef54c397c679db23e
 2021-01-06 16:00:40 +00:00
James Mattis
ea848623c9 Merge "Update to Diagnostic Callback flows for multilayer" am: 3b75f7a8e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510596

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2eb635ce32e4df1d0d0e78ff7398790d2f3fdc7e
 2021-01-06 15:45:01 +00:00
TreeHugger Robot
b8e8fe89e7 Merge "[RESTRICT AUTOMERGE] Make WPMS look for DOs and POs in the correct calling user" into rvc-qpr-dev 2021-01-06 15:36:36 +00:00
James Mattis
3b75f7a8e9 Merge "Update to Diagnostic Callback flows for multilayer" 2021-01-06 15:25:56 +00:00
Lorenzo Colitti
4d4aa881b0 Merge "Migrate away from AsyncChannel in NetworkAgent" am: 91348d9f22 am: 2652fbdaf1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7aa23752ed86096651e122b8497180052fa16337
 2021-01-06 14:44:24 +00:00
Bill Yi
acb77301d3 [automerger skipped] Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: e4b09fd3dd am: 511b12a0c4 -s ours 
am skip reason: Change-Id I034d45f1afcdd07c0b12e2db7e4134b695ec5c70 with SHA-1 ca6272cf1e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34bd275db0a8ba59f9443d29e600f0e09384965c
 2021-01-06 14:43:27 +00:00
Bill Yi
e0fc7fdc88 [automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 2dcac1e2a1 am: c10c4e8f3e -s ours 
am skip reason: Change-Id I034d45f1afcdd07c0b12e2db7e4134b695ec5c70 with SHA-1 ca6272cf1e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a1b6a0ce2d52dfd82d11521a8465c0465dd0591
 2021-01-06 14:43:19 +00:00
Lorenzo Colitti
2652fbdaf1 Merge "Migrate away from AsyncChannel in NetworkAgent" am: 91348d9f22 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29a9073fcd69953811d899d3b421624d21a81edb
 2021-01-06 14:26:23 +00:00
Bill Yi
511b12a0c4 Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: e4b09fd3dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3c3112de6c6b91e7f5abb80c948dbe8db8c9195
 2021-01-06 14:22:37 +00:00
Bill Yi
c10c4e8f3e Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 2dcac1e2a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c3638aad7320dfc31798963ca7101c675212c3a
 2021-01-06 14:19:18 +00:00
Lorenzo Colitti
91348d9f22 Merge "Migrate away from AsyncChannel in NetworkAgent" 2021-01-06 14:10:21 +00:00
Bill Yi
e4b09fd3dd Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" 2021-01-06 13:58:58 +00:00
Alex Kershaw
72704403aa [RESTRICT AUTOMERGE] Make WPMS look for DOs and POs in the correct calling user 
Currently, it will always look in user 0 since it uses the DPM from
mContext, which will always be from user 0 as WPMS is in the system
server process.

Extend DPMI to provide the necessary external helper API. This is
preferable to just using createContextAsUser before getting the DPM
instance since it avoids a second binding.

Fixes: 144048540
Fixes: 172682826
Bug: 153995973
Bug: 174642338
Test: atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testSetWallpaper_disallowed
Change-Id: I52b71000fac31ff6725ddded58206f69b263ae33
(cherry picked from commit 5b36ee3f1d)
 2021-01-06 13:08:42 +00:00
Treehugger Robot
71b7dc627a Merge "Add WM owners to the OWNERS of the related core tests" am: b59598f790 am: 56dde88a69 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540910

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b5ea5e38660cabfbb853fee49ca07a0d672a2ee
 2021-01-06 13:05:20 +00:00
Treehugger Robot
56dde88a69 Merge "Add WM owners to the OWNERS of the related core tests" am: b59598f790 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540910

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id2dc466fb1e8eb6c8f43283980bcdc5b22a1af35
 2021-01-06 12:50:15 +00:00
Treehugger Robot
b59598f790 Merge "Add WM owners to the OWNERS of the related core tests" 2021-01-06 12:27:13 +00:00
Treehugger Robot
b704222433 Merge "Change log tag of DynamicSystemClient to match class name" am: 916dfddfd0 am: 198e4b4c4b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36612768f8f876e93c624ed59d7c92bed7ae8b2d
 2021-01-06 11:24:01 +00:00
Rhed Jao
3adb225c8b Merge changes I5e1802c5,I4542568f,I99a052d7,Iae89206d,Ie955266a am: 9ca3672319 am: 918cc97a12 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532905

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic99132f50babb1d890f737dc3a54e5b381f3c890
 2021-01-06 11:23:40 +00:00
Rhed Jao
abe52a0718 Fixes an error handling in BugreportProgressService am: 39b6acbb55 am: 76ac95e9be 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532904

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If008b5ebdd158b5e0d96ccffb802b4916e4ebcf8
 2021-01-06 11:23:30 +00:00
Rhed Jao
f64837f147 Fixes BugreportReceiverTest failed am: e9a2038f8a am: dfa52cd654 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532903

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c440c0fb7b6a92cf20349f30cad299bb3b71dcc
 2021-01-06 11:23:26 +00:00
Rhed Jao
bf05d69e16 Fix BugreportReceiverTest am: 2150ce56db am: 4059b750f7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532902

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If97c1b1c19c4287443acd2c50d05191b2c1a94a5
 2021-01-06 11:23:22 +00:00
Rhed Jao
013276f9aa Do not buzzing for each progress of bugreport notification am: 52e7d23f53 am: 186d884b05 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4bfc7ae9c68f16ba9daf8229c459be055ae86682
 2021-01-06 11:23:20 +00:00
Neil Fuller
6b9434f9b3 Merge "Add an OWNERS file for location tz detection code" am: 8bdd40d2e5 am: e4ce0c47a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540127

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia00f758c3df3444dabd16f693ff6c4f84d665453
 2021-01-06 11:22:02 +00:00
Treehugger Robot
198e4b4c4b Merge "Change log tag of DynamicSystemClient to match class name" am: 916dfddfd0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id89897af726a891adba349012e86af45ce02bf75
 2021-01-06 11:16:56 +00:00
Treehugger Robot
916dfddfd0 Merge "Change log tag of DynamicSystemClient to match class name" 2021-01-06 11:11:58 +00:00
Rhed Jao
918cc97a12 Merge changes I5e1802c5,I4542568f,I99a052d7,Iae89206d,Ie955266a am: 9ca3672319 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532905

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I151bb11d0b36dae2ac6d67c9a57e1619543bd136
 2021-01-06 11:11:40 +00:00
Rhed Jao
76ac95e9be Fixes an error handling in BugreportProgressService am: 39b6acbb55 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532904

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51ae9156cbb4148ce1b1c97e8d06fa23a4bccf8f
 2021-01-06 11:09:10 +00:00
Rhed Jao
dfa52cd654 Fixes BugreportReceiverTest failed am: e9a2038f8a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532903

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a9a0fefa6e02271ee18e339c7c54e5e04573f6a
 2021-01-06 11:05:39 +00:00
Rhed Jao
4059b750f7 Fix BugreportReceiverTest am: 2150ce56db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532902

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75b3e243ac9219b01e6a0e00a9e35dc3ec852cb6
 2021-01-06 11:00:41 +00:00