Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
622,587 Commits 3 Branches 0 Tags
827790409bd6b52857a1ab9031ba88e61bdfd548
Commit Graph

622587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
827790409b Merge changes from topic "limited_use_key" into sc-dev am: 61e00321e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13461956

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idff7d6da72dc2e953f08603f278b4c51cdd9b7b0
 2021-02-03 10:08:52 +00:00
Qi Wu
2e0a231bd4 Limited use key: feature flags. am: e8af77951b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13461619

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6352131eaec4d8bbcde3c1abffb9c6d9c5df4cb0
 2021-02-03 10:08:48 +00:00
TreeHugger Robot
61e00321e5 Merge changes from topic "limited_use_key" into sc-dev 
* changes:
  Add limited use keys related API into Keystore 2.0 SPI.
  Limited use key: feature flags.
 2021-02-03 09:56:37 +00:00
Yi Jiang
1cd3fe4b72 Merge "Fixes a typo in Rotation Resolver." into sc-dev am: 8812ace3a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13463581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I507fe8d3630087f236e623bc0e7f8d4e7f60c8e2
 2021-02-03 08:29:37 +00:00
Yi Jiang
8812ace3a8 Merge "Fixes a typo in Rotation Resolver." into sc-dev 2021-02-03 08:21:03 +00:00
Kyunglyul Hyun
d50283304e Merge "Change MR2Manager.Callback to interface" into sc-dev am: c5a8e95227 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13434965

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f131d0ce2318cf2d397b7e18487ee6aa49cc201
 2021-02-03 08:17:49 +00:00
Nataniel Borges
147e85571c Merge "Provides assertion blocks on Flicker" into sc-dev am: 7004ef2675 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13427510

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9191b5fe7f119e0a304b35bb163606d0382ab78
 2021-02-03 08:17:33 +00:00
Nataniel Borges
f794e30dfe Merge "Disable flaky tests" into sc-dev am: 04c8c54b15 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13447829

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d0131348a3714360a58f8b48162caa3bb022a05
 2021-02-03 08:17:09 +00:00
Kyunglyul Hyun
c5a8e95227 Merge "Change MR2Manager.Callback to interface" into sc-dev 2021-02-03 08:00:39 +00:00
Nataniel Borges
7004ef2675 Merge "Provides assertion blocks on Flicker" into sc-dev 2021-02-03 07:21:25 +00:00
Nataniel Borges
04c8c54b15 Merge "Disable flaky tests" into sc-dev 2021-02-03 07:21:10 +00:00
Qi Wu
fcb4e8ee2d Add limited use keys related API into Keystore 2.0 SPI. 
Bug: b/174140443
Test: atest CtsKeystoreTestCases

The new CTS tests for this feature is introduced in aosp/1556464

Change-Id: I9620c4a3e5d2c10ed8a50d494e63eb2fb19dabef
 2021-02-03 07:11:33 +00:00
Jackal Guo
f1450aaa8d Merge "Invalidate cached result of getPackagesForUid" into sc-dev am: 8b77168f47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13449182

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb3cead0f9c85abdf384703cef7405ed972b0eae
 2021-02-03 07:02:19 +00:00
Jackal Guo
d4124f32c2 Merge "Apply package visibility in getPackageForUid for shared UID apps" into sc-dev am: 51e642b920 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13424590

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b50808a566b0b3b988d0a61bbbf504dfbb6e81b
 2021-02-03 07:02:17 +00:00
Jackal Guo
8b77168f47 Merge "Invalidate cached result of getPackagesForUid" into sc-dev 2021-02-03 06:57:20 +00:00
Jackal Guo
51e642b920 Merge "Apply package visibility in getPackageForUid for shared UID apps" into sc-dev 2021-02-03 06:57:20 +00:00
James Mattis
05dd191ea5 Merge "Adding support for multiple "default" networks" am: 8bb0310bbe am: 0a3ad27abb am: 40ebaee7a5 am: 37bbbd476e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532548

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34c8f63a1835af5a2dae186ee4fb3d1b3a181ee6
 2021-02-03 06:53:11 +00:00
Kevin Chyn
23c2c21647 Merge "Add team members to core/res/OWNERS" am: 06413eea7a am: b3bb81d3fc am: a323e040ef am: de4b3030b6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571375

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I003fc3ba6012d23d4cfe234850600c51afaf6c7c
 2021-02-03 06:53:01 +00:00
Etan Cohen
661f8b8ccd Merge "[WIFI] Fix typo in permission type for RESTART_WIFI_SUBSYSTEM" am: b9fbc02c52 am: e240627d4e am: 7c61715592 am: 3931024ee3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571129

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I367cd4ccda5942504239543aa7e5624930bd0705
 2021-02-03 06:52:45 +00:00
James Mattis
37bbbd476e Merge "Adding support for multiple "default" networks" am: 8bb0310bbe am: 0a3ad27abb am: 40ebaee7a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532548

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibcb06ea4004e988190ac8ae0dfaa2498d79777fb
 2021-02-03 06:44:30 +00:00
Kevin Chyn
de4b3030b6 Merge "Add team members to core/res/OWNERS" am: 06413eea7a am: b3bb81d3fc am: a323e040ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571375

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4551e1416bf366dbcb5f728f6b47f0e9a0d95363
 2021-02-03 06:44:11 +00:00
Etan Cohen
3931024ee3 Merge "[WIFI] Fix typo in permission type for RESTART_WIFI_SUBSYSTEM" am: b9fbc02c52 am: e240627d4e am: 7c61715592 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571129

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic149998cb88bbcade1c061af6c17225ae618a20a
 2021-02-03 06:43:38 +00:00
TreeHugger Robot
e03b16316d Merge "Cache permission policy" into sc-dev am: e51a931cd2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13432492

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70792b3ccd9c1b02a0b1df12c1f800041d926349
 2021-02-03 06:43:25 +00:00
TreeHugger Robot
407fd1fbf2 Merge "Adds smart autorotate setting to the system." into sc-dev am: b5884dc67c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420209

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc520318671866ed6b0004e551cf4c1480c7d282
 2021-02-03 06:43:03 +00:00
TreeHugger Robot
5e88b635a1 Merge "Fixing gradle complain on skipping constructor method mid-way" into sc-dev am: 6c3b1b0b76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13464212

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82ff8aba9bbc04f595958a7a0f4d441c59fc6ebd
 2021-02-03 06:42:24 +00:00
TreeHugger Robot
e51a931cd2 Merge "Cache permission policy" into sc-dev 2021-02-03 06:41:02 +00:00
TreeHugger Robot
b5884dc67c Merge "Adds smart autorotate setting to the system." into sc-dev 2021-02-03 06:18:42 +00:00
Yi Jiang
f56d9ef789 Fixes a typo in Rotation Resolver. 
Bug: 172370409
Test: manually tested on local devices.
Change-Id: Ie6b6f131e3772fa9cc0867dff78addded4c8cb10
 2021-02-03 06:17:14 +00:00
Galia Peycheva
8a6f75626e Merge changes from topic "revert-13350963-blur_system_api-AFRJFBKNBA-sc-dev" into sc-dev am: e6ae6e325a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13431935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib9a9d697049cea715993c37f94e7bc91437e80b5
 2021-02-03 06:11:49 +00:00
Galia Peycheva
4eef17b04c Revert "Make window background blurs SystemApi" am: 3804d61f2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13431934

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib770a5058e07ff9d1c54a8a1d97d175d81ddcb10
 2021-02-03 06:11:45 +00:00
Galia Peycheva
54c4fe4486 Revert "Make BackgroundBlurDrawable a SystemApi" am: f83b52cc13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13431933

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7571c05be47df422cce9a55c0e622831d5bfdfbd
 2021-02-03 06:11:42 +00:00
TreeHugger Robot
6c3b1b0b76 Merge "Fixing gradle complain on skipping constructor method mid-way" into sc-dev 2021-02-03 06:09:58 +00:00
TreeHugger Robot
c35219b8f8 Merge "Fix UDFPS enrollment shadow" into sc-dev am: ba8bc8e90d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13459675

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4edfd083e0d08436726b939eadaf87c705066fa2
 2021-02-03 06:08:45 +00:00
Galia Peycheva
e6ae6e325a Merge changes from topic "revert-13350963-blur_system_api-AFRJFBKNBA-sc-dev" into sc-dev 
* changes:
  Revert "Add permission for blur SystemApi"
  Revert "Make window background blurs SystemApi"
  Revert "Make BackgroundBlurDrawable a SystemApi"
 2021-02-03 05:49:41 +00:00
James Mattis
40ebaee7a5 Merge "Adding support for multiple "default" networks" am: 8bb0310bbe am: 0a3ad27abb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532548

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic28670aa18dcdd88016733f6b258d4d19a3f358e
 2021-02-03 05:46:43 +00:00
Kevin Chyn
a323e040ef Merge "Add team members to core/res/OWNERS" am: 06413eea7a am: b3bb81d3fc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571375

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie96fed4f5b813af16847d8c9a28b8a53f990f960
 2021-02-03 05:46:02 +00:00
Etan Cohen
7c61715592 Merge "[WIFI] Fix typo in permission type for RESTART_WIFI_SUBSYSTEM" am: b9fbc02c52 am: e240627d4e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571129

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb15875f5e3a77d020f992c02ea53123b464c0fb
 2021-02-03 05:45:15 +00:00
TreeHugger Robot
ba8bc8e90d Merge "Fix UDFPS enrollment shadow" into sc-dev 2021-02-03 05:44:57 +00:00
James Mattis
0a3ad27abb Merge "Adding support for multiple "default" networks" am: 8bb0310bbe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532548

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifeab79368573449cad035de2209db9640f861de3
 2021-02-03 05:19:41 +00:00
Kevin Chyn
b3bb81d3fc Merge "Add team members to core/res/OWNERS" am: 06413eea7a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571375

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibda92da73404eac30d2c148c376cca5b066826dc
 2021-02-03 05:17:40 +00:00
TreeHugger Robot
59d3081eeb Merge "Turn on the feature flag for Android S Settings." into sc-dev am: 421ce84db7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13451575

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib62087cf50d06b45ca45f55bba0cbdd7ec459260
 2021-02-03 05:17:09 +00:00
Alexander Dorokhine
66a366659c Merge "Update framework from Jetpack." into sc-dev am: bad7328c54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13434322

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I527e09c6d600549d7dad984ac3a32e9207dc83c2
 2021-02-03 05:16:16 +00:00
Amy Zhang
2fe8502d80 Merge "Connect FilterSettings between TunerFilter and FilterClient" into sc-dev am: 7662949956 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13459880

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7fbbf09a9c47be3c6cbb54e728bf977c8de9eb2
 2021-02-03 05:15:52 +00:00
Junyu Lai
4bfffacf66 Merge "[FUI20] Expose UnderlyingNetworkInfo as system Api" am: 75b50a5c73 am: ce1b075b2b am: 93af32819c am: ea7f3662da 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563496

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c907d58663b1d942a3b1a8ef6a84888adadca89
 2021-02-03 05:15:16 +00:00
Etan Cohen
e240627d4e Merge "[WIFI] Fix typo in permission type for RESTART_WIFI_SUBSYSTEM" am: b9fbc02c52 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571129

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56b829e9eb85aa5fa65dfd03eb337796a8628d8c
 2021-02-03 05:14:30 +00:00
Jack Yu
6f110b8253 [automerger skipped] Merge "Add attr for nfc applications to configure support power states" am: 809b2f2459 am: 87e9535aa3 am: 73b63e3819 -s ours am: 3b35ad2fda -s ours 
am skip reason: Change-Id I03bd537082117e595a7badfb2d8ca6ee7cae08cf with SHA-1 ad9223f687 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21e77c36329bbfba094be7456131777cda1129d7
 2021-02-03 05:13:50 +00:00
Jeongik Cha
8a7dbd131f Merge "Specify version for aidl_interface explicitly" am: 4561d23a6a am: 66783f7bb6 am: 274d92c6a3 am: d647902ca6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569000

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I564bdc6eb48c30e169feaf19492d8e803d10491f
 2021-02-03 05:13:29 +00:00
TreeHugger Robot
421ce84db7 Merge "Turn on the feature flag for Android S Settings." into sc-dev 2021-02-03 04:58:28 +00:00
Alexander Dorokhine
bad7328c54 Merge "Update framework from Jetpack." into sc-dev 2021-02-03 04:46:48 +00:00
Amy Zhang
7662949956 Merge "Connect FilterSettings between TunerFilter and FilterClient" into sc-dev 2021-02-03 04:42:26 +00:00