Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
555,045 Commits 3 Branches 0 Tags
5efde01ac145de822ae7dc3f95e344227de5e918
Commit Graph

18644 Commits

Author SHA1 Message Date
Automerger Merge Worker
0a08a110f6 Merge "Merge "Reduce "Failed to find provider info" logspam." into rvc-dev am: 6a28d69c24 am: 19459ea5a7 am: 4a2e25e155" into rvc-qpr-dev-plus-aosp am: 7bcc302d2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813686

Change-Id: I87171c252528746891bf5d13562ac1f51f51cb3d
 2020-06-09 23:22:57 +00:00
TreeHugger Robot
4a2e25e155 Merge "Reduce "Failed to find provider info" logspam." into rvc-dev am: 6a28d69c24 am: 19459ea5a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813686

Change-Id: I0cec965e7dbcf0403daaa0b9189b2794776fe787
 2020-06-09 22:52:36 +00:00
TreeHugger Robot
6a28d69c24 Merge "Reduce "Failed to find provider info" logspam." into rvc-dev 2020-06-09 22:41:40 +00:00
Automerger Merge Worker
8a75fa8bac Merge "Merge "Remove debug code before beta release." into rvc-dev am: c81dddfda6 am: c315e25ec7 am: 5b1ac9a432" into rvc-qpr-dev-plus-aosp am: 71a03b357b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11810423

Change-Id: I07759ef87a7503f6a79f3167ebe53f99d1ba50c7
 2020-06-09 21:03:33 +00:00
Varun Shah
4bffd45f2f Reduce "Failed to find provider info" logspam. 
If the user is not unlocked, log at the warning level instead of error
to reduce logspam from non-direct boot aware providers.

Fixes: 148747075
Test: manual (observe logs before and after user unlock)
Change-Id: Icd0fb23982a78fb413f329da93b2ce01d37aca2a
 2020-06-09 13:39:53 -07:00
TreeHugger Robot
c315e25ec7 Merge "Remove debug code before beta release." into rvc-dev am: c81dddfda6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11810423

Change-Id: Id3912360601216fa259376320abcfc772981c6f0
 2020-06-09 20:21:11 +00:00
Hui Yu
cdfb1d6c30 Remove debug code before beta release. 
Remove the debug code for feature:
1. Background started FGS while-in-use permission restriction
2. Foreground service type camera and microphone.

Bug: 158579189
Test: atest cts/tests/app/src/android/app/cts/ActivityManagerApi29Test.java
atest cts/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java
atest cts/tests/app/src/android/app/cts/ActivityManagerProcessStateTest.java

Change-Id: I9669db918af3740509a090c3075d93588110cea1
 2020-06-09 10:36:57 -07:00
TreeHugger Robot
29be1558ae Merge "Remove unused DPM.getGuestUserDisabled" 2020-06-09 16:48:33 +00:00
Hui Yu
ed8333a132 Merge "Add uid to PendingStartActivityUids when activity resumed." into rvc-dev am: c05fd22ce1 am: bb97cab3ce am: 7741f96d0b am: b5778ec4b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11723113

Change-Id: I622183cac721cc016dbeafe0de543c21ecb61cfb
 2020-06-09 05:54:08 +00:00
Hui Yu
b5778ec4b0 Merge "Add uid to PendingStartActivityUids when activity resumed." into rvc-dev am: c05fd22ce1 am: bb97cab3ce am: 7741f96d0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11723113

Change-Id: I172f8156883d4e4c22560755e5bb6d7d0bd3c652
 2020-06-09 05:40:25 +00:00
Hui Yu
eb487f610a Merge "Add uid to PendingStartActivityUids when activity resumed." into rvc-dev am: c05fd22ce1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11723113

Change-Id: Ie1ac5bbc2ee1e2af4708c8e584568f8f3d6cecb3
 2020-06-09 05:14:29 +00:00
Hui Yu
c05fd22ce1 Merge "Add uid to PendingStartActivityUids when activity resumed." into rvc-dev 2020-06-09 05:01:28 +00:00
Joanne Chung
83ebf36a81 Merge "Handle SyncResultReceiver.TimeoutException" into rvc-dev am: 9856804eb2 am: 4a235e4bf2 am: d853673b5c am: 1d930502f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11489902

Change-Id: I5fc69b553035d1de9932776ee98f5ecc999723b0
 2020-06-09 01:09:13 +00:00
Joanne Chung
d853673b5c Merge "Handle SyncResultReceiver.TimeoutException" into rvc-dev am: 9856804eb2 am: 4a235e4bf2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11489902

Change-Id: I229a595052b53349a6a6ddab4df888e219afb5ef
 2020-06-09 00:48:26 +00:00
Joanne Chung
158b81b6f0 Merge "Handle SyncResultReceiver.TimeoutException" into rvc-dev am: 9856804eb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11489902

Change-Id: I3be81b8ba85c2ed8809f2c798a543bd4ff5469fe
 2020-06-09 00:35:13 +00:00
Hui Yu
08ab384989 Add uid to PendingStartActivityUids when activity resumed. 
Previously we add uid to PendingStartActivityUids at activity start.
Now we also add uid to PendingStartActivityUids at activity resumed
because we can not wait for updateOomAdj() to be run by a runnable that
WindowManager send to DisplayThread at activity resumed.

At ActivityManagerService.getProcessStatesAndOomScoresForPIDs(), if the
ProcessRecord is in PendingStartActivityUids, we hard code the
ProcessRecord to be PROCESS_STATE_TOP and FOREGROUND_APP_ADJ, ahead of
result of updateOomAdj() the comes later.

Bug: 155143386, 157180494
Test: Reproduce steps of 155143386, swipe between GCA and
Snapchat, camera access is allowed after swipe.

Change-Id: Ia11b0e3400e4df851b250beb01dcfda43580668b
 2020-06-08 15:35:26 -07:00
Nate Myren
acf97b902d Merge "Revert "Use permissionController name rather than hardcode"" into rvc-dev-plus-aosp am: 3ff65c2dfd am: d2ff0b9855 am: f8d1b105b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11795379

Change-Id: I2ae9e78387248d13630d5a176683a17e6aa273d9
 2020-06-08 20:13:46 +00:00
Nate Myren
61ab30d2a6 Revert "Use permissionController name rather than hardcode" 
Revert submission 11618534-rename-resources

Reason for revert: Possible cause of ~20 test failues, see b/158441669
Reverted Changes:
I5b5b6699f:Use permissionController name rather than hardcode...
I47105cb3a:Remove hardcoding of permission controller package...
I70a43c216:Use aapt2 flag --rename-resources-package in soong...
I60c7f60e9:Use overriden id for resource getIdentifier
Ie8e1c7a9e:Remove resource getIdentifier workaround

Change-Id: Ifdf120ab407db9057810129c3c7bd873524d9129
 2020-06-08 19:35:05 +00:00
Joanne Chung
c6adc68368 Handle SyncResultReceiver.TimeoutException 
1.Change SyncResultReceiver.TimeoutException to checked exception
2.Handle the SyncResultReceiver.TimeoutException in AutofillManager,
ContentCaptureManager, ContentSuggestionsManager
3.Fix the bug we should throw e.rethrowFromSystemServer()

Bug: 156044027
Test: atest CtsAutoFillServiceTestCases
Test: atest ContentSuggestionsManagerTest
Test: atest CtsContentCaptureServiceTestCases
Change-Id: I959d2aca2b80866c076fae2520de66c123f5367d
 2020-06-08 14:53:45 +08:00
Shawn Lin
1e6eea2617 Merge "Add a @hide ctr to disable background layer in ActivityView & SurfaceView" into rvc-dev am: c54d84a858 am: 2b2fb4e5fc am: 78c218618c am: 425c1973b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700783

Change-Id: I878f57a19c28fa062c5adf579e5184c0ee7e5e40
 2020-06-08 04:41:45 +00:00
Shawn Lin
78c218618c Merge "Add a @hide ctr to disable background layer in ActivityView & SurfaceView" into rvc-dev am: c54d84a858 am: 2b2fb4e5fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700783

Change-Id: Ie406215ccf85c2c303883aab64e1a075ba23dd17
 2020-06-08 03:58:06 +00:00
Shawn Lin
855ecdd0e8 Merge "Add a @hide ctr to disable background layer in ActivityView & SurfaceView" into rvc-dev am: c54d84a858 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700783

Change-Id: I103f7db216c495c2bfeaa83506eca23923b92e1f
 2020-06-08 03:45:53 +00:00
Shawn Lin
c54d84a858 Merge "Add a @hide ctr to disable background layer in ActivityView & SurfaceView" into rvc-dev 2020-06-08 03:34:20 +00:00
Philip P. Moltmann
23ee1b0bd9 Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a88 am: 93f09facd6 am: 6941c18cd9 am: 34559cfb15 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11669477

Change-Id: Ib49299afce44d97087b7f090a09761dc06b8c072
 2020-06-06 19:07:49 +00:00
Philip P. Moltmann
34559cfb15 Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a88 am: 93f09facd6 am: 6941c18cd9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11669477

Change-Id: I42d731fc6e1d20625f0508b8717a2a194f192352
 2020-06-06 18:46:06 +00:00
Philip P. Moltmann
218504d8a2 Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a88 am: 93f09facd6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11669477

Change-Id: I71ceeb8840ba0bc8aa92a8e4db9fe17a6b3e2245
 2020-06-06 18:32:03 +00:00
Philip P. Moltmann
802f5b5005 Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11669477

Change-Id: Ieb4c0a463493723fab5f344ae6d80cfaad138e08
 2020-06-06 18:19:01 +00:00
Philip P. Moltmann
8083336a88 Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev 2020-06-06 18:10:11 +00:00
Steve Elliott
cb1af1e0be Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59af am: ce90e8037d am: 1557f3e094 am: 454e0f2108 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11727185

Change-Id: Ied6eaf76018356f682c495c96ef1b279a927e463
 2020-06-06 16:09:01 +00:00
Svetoslav Ganov
f74f28160d Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba38f am: d9f92e4666 am: deb797776a am: 2191f1c2e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11747376

Change-Id: I4405ec52394c0093d0f37da512e5a2fd827a4e1b
 2020-06-06 15:49:46 +00:00
Steve Elliott
1557f3e094 Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59af am: ce90e8037d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11727185

Change-Id: Ic3f5aba0428e22e1124b2f7f1cc76b803e7202dd
 2020-06-06 15:41:43 +00:00
Steve Elliott
eec7f12366 Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11727185

Change-Id: I43fc706e88d78547aed43737ffadcb93b54da0bf
 2020-06-06 15:29:19 +00:00
Svetoslav Ganov
deb797776a Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba38f am: d9f92e4666 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11747376

Change-Id: Iba05ad9051487dfe285997e97b5075579602a88d
 2020-06-06 15:21:45 +00:00
Steve Elliott
05e10b59af Merge "Fix missing icon for one-to-one convos" into rvc-dev 2020-06-06 15:12:04 +00:00
Svetoslav Ganov
2d56a15699 Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba38f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11747376

Change-Id: I3cd684c2f48b456efe4831a1bcb1dbffa9857c8c
 2020-06-06 15:06:03 +00:00
Svetoslav Ganov
0ce4fba38f Merge "Correctly offset app op history on reboot" into rvc-dev 2020-06-06 14:50:03 +00:00
Stanislav Zholnin
5a337a6a9f Merge "Keep unforwarded operation for noted ops." into rvc-dev am: c784a29dfd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689275

Change-Id: I1805e5b42ddbc311677a7e80de9f5c3bcb8ffccd
 2020-06-06 14:30:43 +00:00
Stanislav Zholnin
c784a29dfd Merge "Keep unforwarded operation for noted ops." into rvc-dev 2020-06-06 14:12:38 +00:00
Stanislav Zholnin
e44f134adb Keep unforwarded operation for noted ops. 
Align treatment of noted ops with AsyncNotedOps.

Fixes: 154775996
Test: atest AppOpsLoggingTest#disableCollectedAndNoteSyncOpAndCheckLog
Change-Id: I3dcd8275b6229946875bc184d25b18d2da76d5ba
Merged-In: I3dcd8275b6229946875bc184d25b18d2da76d5ba
 2020-06-06 06:45:16 +00:00
Stanislav Zholnin
bae7c6eecc Merge "Keep unforwarded operation for noted ops." 2020-06-06 05:07:01 +00:00
Automerger Merge Worker
cc84f81eee Merge "Merge "Pass displayId to onActivityRotation()" into rvc-dev am: 2983b70983 am: 7309578767 am: e0ddf1d34f" into rvc-qpr-dev-plus-aosp am: f709fd9fc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745487

Change-Id: I7107612fed72444fb71562e241fd8b6a08014dae
 2020-06-05 19:58:15 +00:00
Vinit Nayak
4b4673021b Merge "Pass displayId to onActivityRotation()" into rvc-dev am: 2983b70983 am: 7309578767 am: e0ddf1d34f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745487

Change-Id: I656ee1038e2ba1745078fa2ec810796b2064ac9f
 2020-06-05 19:46:59 +00:00
Vinit Nayak
e5596e83cb Merge "Pass displayId to onActivityRotation()" into rvc-dev am: 2983b70983 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745487

Change-Id: I4ba1088269fec55593541d4a448cb511be5d470a
 2020-06-05 19:10:28 +00:00
Automerger Merge Worker
92b65d94a1 Merge "Merge "Use a ReferenceQueue to prune weak references" into rvc-dev am: 0053a10ea0 am: 3c7d44954d am: 5efdfc829d" into rvc-qpr-dev-plus-aosp am: 1529da6153 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707956

Change-Id: I065de674e98b7005d16e2e4d600e7dad8820cb1f
 2020-06-05 19:05:00 +00:00
Stanislav Zholnin
90720ca7d9 Keep unforwarded operation for noted ops. 
Align treatment of noted ops with AsyncNotedOps.
Exempt-From-Owner-Approval: approved in rvc-dev, resolving conflict

Fixes: 154775996
Test: atest AppOpsLoggingTest#disableCollectedAndNoteSyncOpAndCheckLog
Change-Id: I3dcd8275b6229946875bc184d25b18d2da76d5ba
 2020-06-05 19:03:54 +00:00
Vinit Nayak
2983b70983 Merge "Pass displayId to onActivityRotation()" into rvc-dev 2020-06-05 18:58:32 +00:00
Ryan Mitchell
5efdfc829d Merge "Use a ReferenceQueue to prune weak references" into rvc-dev am: 0053a10ea0 am: 3c7d44954d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707956

Change-Id: I07cc171872594cb70591e7c63eb33dbfd6ec396e
 2020-06-05 18:44:21 +00:00
Ryan Mitchell
ccd12e5eed Merge "Use a ReferenceQueue to prune weak references" into rvc-dev am: 0053a10ea0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707956

Change-Id: I0cd3e82bcde0625432f853b257d7fd1d0156197e
 2020-06-05 18:30:36 +00:00
Liz Kammer
4b91335d50 Merge "Use permissionController name rather than hardcode" into rvc-dev-plus-aosp am: e44a2b2bb8 am: 50be28db92 am: 26262a4c9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689878

Change-Id: Ie0b9d3ea4f6862f943464ca4732d41046c8be973
 2020-06-05 18:27:55 +00:00
Ryan Mitchell
0053a10ea0 Merge "Use a ReferenceQueue to prune weak references" into rvc-dev 2020-06-05 18:27:50 +00:00