summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-19Merge cherrypicks of [15034291] into sparse-7461600-L54500000924231959android-11.0.0_r40android11-qpr3-s1-releaseandroid-build-team Robot
Change-Id: I53a9d6ce20806463b726c59e1bb81f5a82c748ad
2021-06-19Revert "Detects all activities for whether showing work challenge"Paul Scovanner
This reverts commit 87fa64ebe46f1b3273e1e42c99ef2a09f19145a8. Reason for revert: b/191385314 Change-Id: I87ac32c9aa6a8d2a43533f7512d5b6ea85fdeb36 (cherry picked from commit bbdd0f043c714c62b45abd39d9078a049db70ef9)
2021-06-16Merge cherrypicks of [14988379, 14988380, 14984749, 14988513, 14988333, ↵android-build-team Robot
14988334, 14988398, 14985920, 14988097, 14988381, 14985921, 14988891, 14987186, 14988382, 14989110, 14988514, 14988515, 14988652, 14988653, 14988654, 14988399, 14988400, 14988401, 14984579, 14987188, 14988532, 14988533, 14988402, 14983067, 14983068, 14974447, 14974448, 14988656, 14988535, 14988536, 14988537, 14988538, 14988539, 14988540, 14988541] into rvc-qpr3-release Change-Id: Idd585049e2143a8f672920e1099c5f081649d0c0
2021-06-16Validate the ServiceRecord state while handling misbehaving FGSJing Ji
Fix a race condition where the previous misbehaving FGS's notifcation is being posted, but that FGS's being stopped, and meanwhile a new FGS is coming up, the system would get confused and results in IllegalStateException. Bug: 182160371 Test: atest CtsAppTestCases:ServiceTest Change-Id: If18e1d7ba88aef693349b82dc6e70f7d98c68665 Merged-In: If18e1d7ba88aef693349b82dc6e70f7d98c68665 (cherry picked from commit ae5a219b955d63cbfcc15465d145a9303aafb807)
2021-06-16Block SAF directory access to /sdcard/AndroidZim
This works for target R+ apps, but need to come up with a better story for target <R. The enforcement in DocumentsUI is target SDK based and those apps bypass the block_tree flag. Bug: 157320644 Test: atest DocumentsTest Change-Id: I93aea7cd5d3b7befea1f78e1cf3f31f8250f1d33 (cherry picked from commit 9d508579aed406220c11022cfc983da46396bd07) Merged-In: I93aea7cd5d3b7befea1f78e1cf3f31f8250f1d33 (cherry picked from commit 1ea98d44490a2383a604b546a5671a783c1000dd)
2021-06-16[RESTRICT AUTOMERGE] Fix OOB write in noteAtomLoggedTej Singh
It's possible for bad atoms to have negative atom ids. This results in an OOB write when we note that the atom was logged. This adds a validation check on the logging. Also added safetynet logging for negative atoms Bug: 187957589 Test: POC in bug no longer led to the OOB write & crash Test: checked event log for safetynet logging Change-Id: I8a6b094c94309d7b02430fb860891ef814efb426 (cherry picked from commit cc0bba36c7c326e2fb75f1531547d2ed861d392c)
2021-06-16[security] SubscriptionGroup is exposed to unprivileged callersSongFerngWang
SubscriptionInfo.mGroupUUID is not cleared in conditionallyRemoveIdentifiers if the caller only has READ_PHONE_STATE (based on a check to checkReadPhoneState) and not READ_DEVICE_IDENTIFIERS. Bug: 181053462 Test: atest SubscriptionManagerTest Change-Id: Ic2b62523330dc6e2169ad851715c4ab3da3b29cf Merged-In: Ic2b62523330dc6e2169ad851715c4ab3da3b29cf (cherry picked from commit 219d284a68f56093aa9ca6610a4999b35c4cf5a9)
2021-06-16Added nullptr check to pullFaceSettingsLockedjoshmccloskey
Fixes: 175852187 Test: It builds. Change-Id: Id1eb98f071a96178de42285bb21ef7009517f748 (cherry picked from commit dab89bdde3893e53eb9a7df7f54fff3b2f4c5029)
2021-05-20Merge cherrypicks of [14651914, 14651880, 14651759, 14652210, 14651594, ↵android-11.0.0_r39android-build-team Robot
14651881, 14651915, 14651882, 14651883, 14651799, 14652154, 14651595, 14651760, 14652271, 14652272, 14652273, 14652056, 14651800, 14651801, 14651802, 14651884, 14651885, 14651886, 14652274, 14652275, 14652276, 14652277, 14652278, 14651894, 14651723, 14652211, 14651895, 14651916, 14651887, 14651888, 14651596, 14651889, 14652212, 14651761, 14652310, 14652311, 14651973, 14651974, 14652312, 14652313, 14651896, 14651803] into rvc-qpr3-release Change-Id: I28774b63565cb22778502a0eb9810751575e2862
2021-05-20Backport of ag/14170751 and ag/14170752.JW Wang
1. An available rollback shouldn't be deleted when its session expires. 2. Add a test to check we don't crash or delete a rollback when its session expires. Bug: 181087240 Bug: 185132440 Test: atest StagedRollbackTest Merged-In: I3c2b718905d2d7619d6f299ee5402fd858de030e Merged-In: I1bd786b38e2df1f4bdc80d0d371d5d2d52e21e06 Change-Id: Id55f1bde0ee69a6f26bc8e109918fb26d1da4e3f (cherry picked from commit 29d5f72db216eeae13cb7d395b2359544012ffce)
2021-05-20Detects all activities for whether showing work challengeLouis Chang
Work challenge did not show when a work activity is not on top, but still visible after screen turns on. Also show work challenge even if the work activity is behind a top fullscreen activity of another profile because the user can still navigate back to the work activity when top activity finishes. Bug: 177457096 Test: RootWindowContainerTests Change-Id: I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 Merged-In: I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 (cherry picked from commit 87fa64ebe46f1b3273e1e42c99ef2a09f19145a8)
2021-05-20Ensure storage permission revoke happens for all usersNate Myren
When revoking storage permissions due to storage escalation, ensure the revoke happens for all users Fixes: 186034260 Bug: 171430330 Test: atest --user-type secondary_user StorageEscalationTest Merged-In: Ieb8bb9cde1576e9eee131338d393b8a3528341ec Change-Id: Ieb8bb9cde1576e9eee131338d393b8a3528341ec (cherry picked from commit 8a1085bdcbdabbd4b5f2fd549afa4e3612b83a0d)
2021-05-20Remove sendNetworkConditionsBroadcastlucaslin
sendNetworkConditionsBroadcast is removed, so TestNetworkStackService.kt cannot override it anymore, otherwise there will be a build break when running this test. Also add a comment for NETWORK_CONDITIONS_MEASURED in AndroidManifest.xml. Bug: 175213041 Test: atest FrameworksNetIntegrationTests Change-Id: I7b43940dc32826c70fa82f471b35bc5cb8394aad Merged-In: I7b43940dc32826c70fa82f471b35bc5cb8394aad (cherry picked from commit c737926795a8cedab091cf01c30914a1bf844da1)
2021-04-17Merge cherrypicks of [14217257, 14217258, 14217339, 14217529, 14217566, ↵android-11.0.0_r38android-build-team Robot
14214972, 14217508, 14216278, 14216279, 14217530, 14217281, 14215011] into rvc-qpr3-release Change-Id: I6d9ce7c32a28ca52edd1a595c957c9926979caf5
2021-04-17Prevent apk-in-apex from being registered under wrong apexMohammad Samiul Islam
Without this fix, an apk-in-apex located in path /apex/com.android.mediaprovider will be added as apk-in-apex for com.android.media too, just because they have the same prefix. Added a info log too to make it easier to understand which apk-in-apex is being registered under which apex. Bug: 170640411 Test: Manual testing Change-Id: Idc989ac84777589b4bdd72012833cdbdab7e872c Merged-In: Idc989ac84777589b4bdd72012833cdbdab7e872c (cherry picked from commit c45a426e8e6343922ff9c6f7380e4e7bbdf360a1) (cherry picked from commit 58cd8bc29e092fc6c13f893c1cd497e7c3b75bdb)
2021-04-07Snap for 7266183 from 90be1b5d2c44dfe03b83cfaaf3b8d9085df838d1 to ↵android-build-team Robot
rvc-qpr3-release Change-Id: I8b6575f0fe8fccc8042c44ea9b8eddc3afae25a7
2021-04-07Mark intents as immutableJulia Reynolds
Test: manual Fixes: 169792886 Fixes: 169793537 Fixes: 169793764 Change-Id: I8ae9efe732b468b8e13e264b0af8f81c596e2e89 (cherry picked from commit 11f2e288466476127e3417e36357154dceb0af8e)
2021-04-06Snap for 7262953 from 1de72903d4a9beb8e0833d021e681ef3bf5e8db3 to ↵android-build-team Robot
rvc-qpr3-release Change-Id: I583350e00ace8e0f841321c386aed6b16885b1dd
2021-04-06Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" ↵Chris Tate
into rvc-dev am: 68a604b920 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13533155 Change-Id: I919b0c3ec34d7c0eb0384a65be961d9191429f1b
2021-04-06DO NOT MERGE - Disallow deletion of channels with FGS notifications am: ↵Christopher Tate
8cb7e0a881 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13533155 Change-Id: I16971c6bbbb7db5c8d63249b14d737c9b2867461
2021-04-06Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" ↵Chris Tate
into rvc-dev
2021-04-06Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" ↵Chris Tate
into rvc-qpr-dev
2021-04-06Restrict alarm broadcastJulia Reynolds
To android only Test: NotificationManagerTest, NotificationManagerServiceTest Bug: 175614289 Change-Id: I4f8e56729d90f8f5288d08881129b1c45d5790e7 Merged-In: I4f8e56729d90f8f5288d08881129b1c45d5790e7 (cherry picked from commit abf15b731af248f512b7cc31ea99019436841af4)
2021-04-06Merge "Rebind InstallSuccess UI on resume" into rvc-qpr-devTreeHugger Robot
2021-04-06Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-devTreeHugger Robot
2021-04-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I70e274cae24244dfd7ced1489a511888aae50751
2021-04-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ib0cd31b7f0d4267bb80a790d9720a2eee4eeb2ed
2021-04-03Snap for 7256547 from 3a6b247ec091e79a31feed5baab82b054e6561d8 to ↵android-build-team Robot
rvc-qpr3-release Change-Id: If544b68af2156503a1eedfe05f197b4c980cca48
2021-04-03Merge "getCameraIdListNoLazy : remove system cameras from mTorchStatus as ↵Jayant Chowdhary
well." into rvc-qpr-dev
2021-04-03Snap for 7255997 from 1568caedd453b6ec5823c7894ef0aabd53037330 to ↵android-build-team Robot
rvc-qpr3-release Change-Id: I29d11383e42fed8c4ec053fe54d9e76289d17716
2021-04-02Merge "DO NOT MERGE Set focus to PasswordTextView by default." into rvc-qpr-devTreeHugger Robot
2021-04-02Merge "Increase maximum allowed size for status bar icons" into rvc-dev am: ↵Beth Thibodeau
4fdf4a5cee Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14054273 Change-Id: I74944f0f56979ed1a1029df066fa1de5663fde87
2021-04-02Merge "Increase maximum allowed size for status bar icons" into rvc-qpr-devBeth Thibodeau
2021-04-02Merge "Increase maximum allowed size for status bar icons" into rvc-devBeth Thibodeau
2021-04-02Merge "Sanitize text fields" into rvc-qpr-devBeth Thibodeau
2021-04-02getCameraIdListNoLazy : remove system cameras from mTorchStatus as well.Jayant Chowdhary
Bug: 182530469 Test: Make Emulator back camera system camera; atest FlashlightTest.java Merged-In: I0a149ba3d93a740cfbfdc2d04c1235e648061156 Change-Id: I0a149ba3d93a740cfbfdc2d04c1235e648061156 Signed-off-by: Jayant Chowdhary <jchowdhary@google.com> (cherry picked from commit bedb9950c8c32e6a5c3a3215c4c886d17720bde9)
2021-04-02Merge "Update carrier privilege check in enforceSubscriptionPlanAccess" into ↵Sarah Chin
rvc-qpr-dev
2021-04-02DO NOT MERGE Set focus to PasswordTextView by default.Youngjun Kwak
This ensures that password will be entered reliably programmatically in CTS. Bug:183644428 Test: atest CtsWindowManagerDeviceTestCases:KeyguardLockedTests && atest CtsWindowManagerDeviceTestCases:MultiDisplayLockedKeyguardTests Change-Id: I35fa005e4571b150995efe8b0cc07a4556e06619
2021-04-01Update carrier privilege check in enforceSubscriptionPlanAccessSarah Chin
Remove isEmbedded() check, since this can be called on both PSIM and ESIM. Replace SM#canManageSubscription with TM#hasCarrierPrivileges, since it is a superset of the checks done in SM#canManageSubscription and applies to both PSIMs as well as ESIMS. Updated the documentation for the two APIs to clarify the differences. Test: atest CtsTelephonyTestCases (SubscriptionManagerTest) Fix: 180451446 Change-Id: Icb4e2c619dacaea9e74cedea31865ec1eb689dce
2021-04-01Snap for 7252659 from 3c8e09045598314506ceefa19a0b163ea5bb1304 to ↵android-build-team Robot
rvc-qpr3-release Change-Id: I063534d34426d65b69bb158a1cf3c6c2393f96ca
2021-04-01Increase maximum allowed size for status bar iconsBeth Thibodeau
The previous size was causing some apps to crash which otherwise worked fine. This more closely matches the hard limit in RecordingCanvas (which we need to stay below to prevent SystemUI from crashing). Fixes: 182891864 Fixes: 182232777 Bug: 169255797 Test: atest StatusBarIconViewTest Test: manual - posting notifications with different drawable sizes Change-Id: I8deacc651e05a202ec980eeb8bcdf4f92daea8eb (cherry picked from commit 5cd7976f7d2b702f803f0628f61f02491834cd41)
2021-04-01Increase maximum allowed size for status bar iconsBeth Thibodeau
The previous size was causing some apps to crash which otherwise worked fine. This more closely matches the hard limit in RecordingCanvas (which we need to stay below to prevent SystemUI from crashing). Fixes: 182891864 Fixes: 182232777 Bug: 169255797 Test: atest StatusBarIconViewTest Test: manual - posting notifications with different drawable sizes Change-Id: I8deacc651e05a202ec980eeb8bcdf4f92daea8eb (cherry picked from commit 5cd7976f7d2b702f803f0628f61f02491834cd41)
2021-04-01Rebind InstallSuccess UI on resumeWinson Chiu
Similar to a previous fix for the main Activity, AlertDialog doesn't work properly if the UI is set up when it's not visible. To avoid this, rebind in onResume. A future refactor should clean this up to avoid the use of AlertDialog. Bug: 182493158 Test: manual, verify fail/success of steps in linked bug Change-Id: I6547385900d4c58ed3d113d7d0162c0cb8c20cba
2021-04-01Merge "Revert "DO NOT MERGE Remove focus on PasswordTextView"" into rvc-qpr-devYoungjun Kwak
2021-04-01Merge "[DO NOT MERGE] Make PendingIntents in screenshots immutable" into ↵Miranda Kephart
rvc-dev am: 637a90a745 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13950908 Change-Id: I8324ef24c628b57df36fb5c856179ed112651652
2021-04-01[DO NOT MERGE] Make PendingIntents in screenshots immutable am: cdd1d2a4feMiranda Kephart
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13950908 Change-Id: I78586b52a5b8930a92ae9fcf421f1de5cb2b3e04
2021-04-01Merge "[DO NOT MERGE] Make PendingIntents in screenshots immutable" into ↵Miranda Kephart
rvc-qpr-dev
2021-04-01Merge "[DO NOT MERGE] Make PendingIntents in screenshots immutable" into rvc-devMiranda Kephart
2021-04-01Merge "wifidisplay: restrict broadcast by the proper permission" into ↵Jimmy Chen
rvc-dev am: 3d6cf521c1 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824717 Change-Id: I38dca494da96afdf2932c94914ba6fce412f308e
2021-04-01Merge "wifidisplay: restrict broadcast by the proper permission" into ↵Jimmy Chen
rvc-qpr-dev
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 03:01:17 +0000