Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
653,130 Commits 3 Branches 0 Tags
2b60e5c052bc74b7fbdbeb87f00489aceed045c8
Commit Graph

653130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fiona Campbell
2b60e5c052 Merge "Fix memory leak in BrightnessSynchronizer" into sc-dev am: d77459a21f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551803

Change-Id: I6340b2d8ea1c2d87120740e52195abbae17d5e7c
 2021-06-17 13:54:47 +00:00
Fiona Campbell
d77459a21f Merge "Fix memory leak in BrightnessSynchronizer" into sc-dev 2021-06-17 13:41:45 +00:00
TreeHugger Robot
c6903b9ae4 Merge "Catch bubbles exception in PeopleTiles" into sc-dev am: 2c95c7632a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946990

Change-Id: Ife6faac12102443c3ea913d90fd99221f2fd6f90
 2021-06-17 13:37:25 +00:00
TreeHugger Robot
2c95c7632a Merge "Catch bubbles exception in PeopleTiles" into sc-dev 2021-06-17 13:26:52 +00:00
TreeHugger Robot
46ad347c51 Merge "KeyguardIndication text updates" into sc-dev am: 0ec737dab8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14986727

Change-Id: I8cc3eac0be8d54d4df1a837977adcfe62c8082c3
 2021-06-17 13:10:15 +00:00
Mathew Inwood
cfad04b010 Merge "Use non-logging compat framework calls" into sc-dev am: 4d4f39980c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14997040

Change-Id: I9d9dff6c9deb68a0ca7038a1030a54210d041e2a
 2021-06-17 13:09:44 +00:00
TreeHugger Robot
0ec737dab8 Merge "KeyguardIndication text updates" into sc-dev 2021-06-17 12:48:23 +00:00
Mathew Inwood
4d4f39980c Merge "Use non-logging compat framework calls" into sc-dev 2021-06-17 12:46:07 +00:00
Pavel Grafov
371749bb5f Merge "More debug for security loggin broadcast" into sc-dev am: 6f5fe9271d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002450

Change-Id: If88e86d1527ae875b115d79ea40b58ea51277de2
 2021-06-17 11:16:06 +00:00
Pavel Grafov
6f5fe9271d Merge "More debug for security loggin broadcast" into sc-dev 2021-06-17 11:04:37 +00:00
Robin Lee
2c5b363965 Merge "SystemUI: add GlobalActionsComponent for tv [1/1]" into sc-dev am: 8766e5c15e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14974997

Change-Id: If4d136a81b28c9149567ebe98beeb33f1d504c43
 2021-06-17 09:37:23 +00:00
Pedro Loureiro
40acf0f6d8 Merge "Run bpfmt on api/Android.bp" into sc-dev am: 2ae1e25b80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14964833

Change-Id: I37b0e1ff388bad062d37c470a2c0c5d71d8a4f6f
 2021-06-17 09:36:40 +00:00
Robin Lee
8766e5c15e Merge "SystemUI: add GlobalActionsComponent for tv [1/1]" into sc-dev 2021-06-17 09:30:28 +00:00
Pedro Loureiro
2ae1e25b80 Merge "Run bpfmt on api/Android.bp" into sc-dev 2021-06-17 09:19:38 +00:00
Riddle Hsu
9bbc42a5a1 Merge "Generalize the condition to take task snapshot when entering AOD" into sc-dev am: 5b24daa483 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14963622

Change-Id: Ieb270cd84f52aed101c19a8aed40cc0a74106371
 2021-06-17 07:19:12 +00:00
Riddle Hsu
5b24daa483 Merge "Generalize the condition to take task snapshot when entering AOD" into sc-dev 2021-06-17 07:07:30 +00:00
Ryan Lin
37c5d61fa5 Merge "Fix incorrect magnification border after rotation" into sc-dev am: 9da336b4c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909658

Change-Id: Ic4d4fb02cd2406c61900731ad7e64ec234938c1a
 2021-06-17 02:02:43 +00:00
Kevin Chyn
5110240628 Merge "Launch action to admin component when button clicked" into sc-dev am: b2e3ba68b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14980524

Change-Id: Ie52eb1c749542fad621034b8f1a00595a147b1ea
 2021-06-17 02:01:31 +00:00
Kevin Chyn
2fe7d4ebed Merge "Add BiometricActionDisabledByAdminController" into sc-dev am: c3e64b14c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972616

Change-Id: I3a7f0f0450053cbff92bbc3db3b2b6139a4d1db0
 2021-06-17 02:00:42 +00:00
Ryan Lin
9da336b4c1 Merge "Fix incorrect magnification border after rotation" into sc-dev 2021-06-17 01:38:49 +00:00
Kevin Chyn
b2e3ba68b0 Merge "Launch action to admin component when button clicked" into sc-dev 2021-06-17 01:28:17 +00:00
Kevin Chyn
c3e64b14c5 Merge "Add BiometricActionDisabledByAdminController" into sc-dev 2021-06-17 01:27:03 +00:00
Nikita Ioffe
0f242fff2f Merge "Drop prebuilt files to android source tree." into sc-dev am: 3989c51011 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002093

Change-Id: Iaa9a87f2a6c0978af71e6c62e45c9a607c693faa
 2021-06-17 00:50:05 +00:00
Nikita Ioffe
3989c51011 Merge "Drop prebuilt files to android source tree." into sc-dev 2021-06-17 00:32:26 +00:00
Felipe Leme
246ad02ef6 Merge "Split DevicePolicyManagerInternal into DevicePolicyManagerLiteInternal." into sc-dev am: 60ec24eb1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14948897

Change-Id: I3dccb36f49e871f2fa08a8268ed07b92a4fdeb12
 2021-06-17 00:24:31 +00:00
Bill Lin
dd211bab21 Merge "Allow one-handed mode shortcut expand notification" into sc-dev am: 789f014c04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14957128

Change-Id: Ifce69988d9f86294ad0b91c94606dedce3a15f08
 2021-06-17 00:23:48 +00:00
Felipe Leme
60ec24eb1e Merge "Split DevicePolicyManagerInternal into DevicePolicyManagerLiteInternal." into sc-dev 2021-06-17 00:03:24 +00:00
Bill Lin
789f014c04 Merge "Allow one-handed mode shortcut expand notification" into sc-dev 2021-06-16 23:59:28 +00:00
TreeHugger Robot
61f6e5bc81 Merge "[DO NOT MERGE] Fix layout for errorprone build" into sc-dev am: b2c6cd7474 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15003713

Change-Id: I11ca399521a10ff9d461ffe5b7cd54e3329fd7cb
 2021-06-16 23:55:27 +00:00
Beth Thibodeau
29350ae917 [DO NOT MERGE] Fix layout for errorprone build am: 79709cfb41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15003713

Change-Id: I07c6589b08202d7cb9c925282d9ce87178576664
 2021-06-16 23:55:24 +00:00
Kevin Chyn
b35863580b Launch action to admin component when button clicked 
Bug: 188847063
Test: "Set up parental controls" screen seen
Test: m -j RunSettingsLibRoboTests ROBOTEST_FILTER=BiometricActionDisabledByAdminControllerTest
Change-Id: Iad3ffbcd87fe3af5ebaf6a1e6078bf772606efc4
 2021-06-16 16:41:14 -07:00
Kevin Chyn
4e84b8849a Add BiometricActionDisabledByAdminController 
1) Adds UserManager#DISALLOW_BIOMETRIC. We actually need to
   pass a restriction from settings to ActionDisabledByAdmin area,
   otherwise the biometric-specific dialog would be shown outside of
   biometric flows.
2) Adds an interface to ActionDisabledByAdminController to return a
   optional OnClickListener for the positive dialog button
3) Returns an instance of the biometric controller when conditions
   are met
4) Adds string interfaces to DeviceAdminStringProvider to retrieve
   biometric-specific strings

Bug: 188847063
Bug: 191306258
Test: manual

Change-Id: Iaeffdeb1336d5db56d464104cdc7677b9021f609
 2021-06-16 16:41:14 -07:00
TreeHugger Robot
b2c6cd7474 Merge "[DO NOT MERGE] Fix layout for errorprone build" into sc-dev 2021-06-16 23:39:43 +00:00
TreeHugger Robot
efc2330818 Merge "Coordinate circle reveal with authRipple" into sc-dev am: 603ade2fcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982805

Change-Id: I03e238639f1d321c037f08c0013186a0df495549
 2021-06-16 22:58:39 +00:00
TreeHugger Robot
603ade2fcc Merge "Coordinate circle reveal with authRipple" into sc-dev 2021-06-16 22:42:56 +00:00
Humza Azam
101ec7d240 Merge "Revert "Revert "Revert "HULK SMASH! We've gotta declare REL."""" into sc-dev am: 83f88bc43a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14994638

Change-Id: I4da072b6910292cb8250f8d147d2186394f30420
 2021-06-16 22:04:20 +00:00
Jorge Gil
1efb640d38 Merge "Start pinchResize only if pointers are inside PIP" into sc-dev am: c6e212c5b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14948317

Change-Id: Ie0f93793235892921790df65006ffa911e5d36f5
 2021-06-16 22:04:08 +00:00
Humza Azam
83f88bc43a Merge "Revert "Revert "Revert "HULK SMASH! We've gotta declare REL."""" into sc-dev 2021-06-16 22:03:08 +00:00
Jorge Gil
c6e212c5b2 Merge "Start pinchResize only if pointers are inside PIP" into sc-dev 2021-06-16 21:59:53 +00:00
John Reck
071edf6a5f Merge "Fix ripples not going away" into sc-dev am: 0d5d58a15f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002973

Change-Id: Id05f76e154b56fa039e4db66c0a24ceb654a3786
 2021-06-16 21:55:15 +00:00
Beth Thibodeau
92907b0bbb Merge "Remove recommendations when setting is disabled" into sc-dev am: c1d7a61b2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14850802

Change-Id: Ie19dd54675122d81b0e2d1e82769be2ba922c7a8
 2021-06-16 21:54:56 +00:00
Nikita Ioffe
e2aac991de Drop prebuilt files to android source tree. 
CtsShim.apk
package: name=com.android.cts.ctsshim
versionCode=31
versionName=12-7464984
platformBuildVersionName=S
compileSdkVersion=31
compileSdkVersionCodename=S
sdkVersion:24
targetSdkVersion:28

CtsShimPriv.apk
package: name=com.android.cts.priv.ctsshim
versionCode=31
versionName=12-7464984
platformBuildVersionName=S
compileSdkVersion=31
compileSdkVersionCodename=S
sdkVersion:24
targetSdkVersion:28

CtsShim.apk
package: name=com.android.cts.ctsshim
versionCode=31
versionName=12-7464984
platformBuildVersionName=S
compileSdkVersion=31
compileSdkVersionCodename=S
sdkVersion:24
targetSdkVersion:28

CtsShimPriv.apk
package: name=com.android.cts.priv.ctsshim
versionCode=31
versionName=12-7464984
platformBuildVersionName=S
compileSdkVersion=31
compileSdkVersionCodename=S
sdkVersion:24
targetSdkVersion:28

Built here: ab/7464984

This build IS suitable for public release.

The change is generated with prebuilt drop tool.

Test: presubmit
Bug: 188062003
Bug: 191262663
Change-Id: I92132d00e248c6d4cc2488af346ddc032e8c727a
 2021-06-16 22:49:50 +01:00
John Reck
0d5d58a15f Merge "Fix ripples not going away" into sc-dev 2021-06-16 21:47:34 +00:00
Beth Thibodeau
c1d7a61b2f Merge "Remove recommendations when setting is disabled" into sc-dev 2021-06-16 21:26:45 +00:00
Beth Thibodeau
79709cfb41 [DO NOT MERGE] Fix layout for errorprone build 
0dp width caused an error because there was no weight. Since this should
never be visible anyways, changed to wrap_content and visibility gone

Bug: 190505997
Test: visual, builds
Change-Id: I6ad5f50b03df78f014c59a201853b290061f9021
 2021-06-16 21:11:04 +00:00
Sunny Goyal
d440cbbf7c Merge "Updating logging so that edge swipe logs do not get evicted by normal taps" into sc-dev am: c0b53c93a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14968417

Change-Id: I15e648013f12cbe5414301dcbcf6347e0cd18ffc
 2021-06-16 21:06:49 +00:00
Humza Azam
32eef1d580 Revert "Revert "Revert "HULK SMASH! We've gotta declare REL.""" 
This reverts commit 67f28e7448.

Reason for revert: Testing fix for b/191191441

Bug: 191191441
Change-Id: I15ca686c7c44626b734ba45e785adbe66fcf624a
 2021-06-16 20:51:30 +00:00
Sunny Goyal
c0b53c93a2 Merge "Updating logging so that edge swipe logs do not get evicted by normal taps" into sc-dev 2021-06-16 20:51:13 +00:00
Mady Mellor
c8e07d87f7 Merge "Fix tests - needed a reasonable max set in bubble positioner" into sc-dev am: 4de2f90856 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002365

Change-Id: I46d6e8486d6c3d641645a52f884a94dd0acbe7cb
 2021-06-16 20:42:58 +00:00
TreeHugger Robot
156c837c3a Merge "Exempt some callers from min-window restrictions" into sc-dev am: 916a356f71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14988270

Change-Id: I40f3ac586976f7a7d41e8ab46a7d0b48c24323ab
 2021-06-16 20:42:52 +00:00