summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-10-14Merge cherrypicks of [12841496, 12841515, 12841186, 12841100, 12841499, ↵android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid-build-team Robot
12841500, 12841101, 12841504] into rvc-qpr1-release Change-Id: I6c1b4c35f34a930ba04c14aa9b10d8aadebe60e4
2020-10-14DO NOT MERGE: Revert "Don't let IME window fit status bar"Tiger Huang
This reverts commit 3cd311415ba00d5d75660a8607d1ece5e68f0534. Reason for revert: The CL causes the regression b/170474494 And it also makes status bar color incorrect while FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS is cleared Fix: 170474494 Change-Id: I26bed08456197721d07f2fab563be0c54e43efd2 (cherry picked from commit 427bdc1c86904649dc7c12cf917c05d61f2fe3fa)
2020-10-13Merge cherrypicks of [12820899, 12820921, 12820267, 12820924, 12820699, ↵android-build-team Robot
12820781, 12821235, 12821236, 12820925, 12821237, 12820545, 12821039, 12820926, 12820927, 12820928, 12820929, 12820930, 12820590, 12820471, 12820591, 12820592, 12820593, 12820594, 12821255, 12821256, 12821257, 12820998, 12820932, 12821258, 12820546, 12820933, 12820934, 12820547, 12820548, 12821275, 12821238, 12821239, 12821240, 12821241, 12821199, 12821276, 12821277, 12821278, 12821279, 12821280] into rvc-qpr1-release Change-Id: I4a6407456ea03c0fa5a810bf57b7465cf06c9513
2020-10-13Use shared libdrmframeworkcommon.Edwin Wong
The libdrmframeworkcommon was statically linked to multiple libraries used by libfwdlockengine. When the shared libraries closes, the same block of static memory will be freed twice. Test: CTS forwardlock tests atest CtsDrmTestCases Bug: 155647761 Change-Id: I45113549772d48e925082d15659b1409cbed6499 (cherry picked from commit 4ed2e6b76dc955a400ed252ce162ee6335276858)
2020-10-13Do not re-initialize synthetic passwordRubin Xu
A bug was introduced in R where LSS ends up regenerating SP when an escrow token is being auto-activated on unsecured user, due to a logic error in shouldMigrateToSyntheticPasswordLocked(). Fix the bug and add some safeguards as well as unit test to prevent future regressions. Bug: 168692734 Test: atest com.android.server.locksettings Change-Id: If35f2fd26b49faf6e3d0d75c10b1b3bb95f247c2 (cherry picked from commit efc1d53df3a2e7116d7ed83bca9bf8e384d32740) (cherry picked from commit 2d51788b08aa85afdb27af4f4586ac40dc949097)
2020-10-13Fix out of bound error of IncidentServiceHoward Ro
Before this change, it was possible for the code to suffer an out of bound error. Bug: 150706572 Test: make Change-Id: I3e8d37f2ee3c942bc9b176edee043557b005c757 (cherry picked from commit 8ff5315e989c1348e313bcb8170b77adc80b2fce) (cherry picked from commit e592700068db0335c83934f191fc9efcbd8037ec)
2020-10-13Fix storing the wrong value of mLockdown in settinglucaslin
When user is stopped, the Vpn#onUserStopped() will be called and the value of mLockdown will be set to false then store into setting. This is a wrong behavior because user doesn't change it, so for this kind of case, there is no need to store the value of mLockdown in setting. In fact, there is no need to call Vpn#saveAlwaysOnPackage() when user is stopped because there is nothing changed. Bug: 168500792 Test: atest FrameworksNetTests Change-Id: Ie85a347216614b7873bfdf199165d89527ada3a8 (cherry picked from commit 9226fc3723a477751705011cd7eecf063b1c3707)
2020-10-13Protect bluetooth.device.action.ALIAS_CHANGEDMyles Watson
Bug: 157472962 Tag: #security Test: build Change-Id: I7737c4f1ad4bf5fec3127526465c78808de03693 (cherry picked from commit a6c09bb2c638cf8be5d98c9e6fcea8caa2b4cbe8)
2020-10-13[BACKPORT] Improve location checks in TelephonyRegistryNathan Harold
Improve location checking for apps targeting SDK28 or earlier. Bug: 158484422 Test: (cts) atest TelephonyLocationTests; atest PhoneStateListenerTest Merged-In: I8caa3ea409836ce8469d8d8210b481a0284594f2 Change-Id: I8caa3ea409836ce8469d8d8210b481a0284594f2 (cherry picked from commit 4e0c7d16fd76bd7743a7f46ba63c75e8c65d63be) (cherry picked from commit cc584e777db03316f98298a18a1844e51592ebef)
2020-10-13Validate user-supplied tree URIs in DocumentsProvider callsAbhijeet Kaur
Currently we only validate DocumentsContract.EXTRA_URI, this change validates other URIs suchs as DocumentsContract.EXTRA_TARGET_URI and DocumentsContract.EXTRA_PARENT_URI as well Bug: 157320716 Test: Manually using the test app in b/157320716#comment1 Change-Id: I90fd1e62aa7dc333bf32eb80ccc5b181a1d54e41 Merged-In: I90fd1e62aa7dc333bf32eb80ccc5b181a1d54e41 (cherry picked from commit b9f4fb792812f9a38ac54e69be6f121f7367c017) (cherry picked from commit eca247f2d33b18d14e0568512a7ee003cbbcd4a9)
2020-10-13Validate user-supplied URIs in DocumentsProvider callsAbhijeet Kaur
Some URIs are used without validating their authorities which can lead to exploitation by malicious apps. Bug: 157294893 Test: Manual using test app in b/157294893 Change-Id: I799509ed5ff7e69140e84d796fe7f96d9dbfd32f Merged-In: I799509ed5ff7e69140e84d796fe7f96d9dbfd32f (cherry picked from commit 75f984bd32a3ee8115d5cea09ab1bd237537ab54) (cherry picked from commit e4bb1d7b6cd538acf423c7d8864dd26819fe8757)
2020-10-13Require permission to create trusted displaysAndrii Kulian
Bug: 162627132 Test: atest VirtualDisplayTest#testTrustedVirtualDisplay Test: atest frameworks/base/packages/SystemUI/tests/src/com/android/systemui/bubbles Test: atest DisplayTest Test: atest VirtualDisplayTest#testTrustedVirtualDisplay Test: atest VirtualDisplayTest#testUntrustedSysDecorVirtualDisplay Test: adb logcat -b events Change-Id: Id06b2013ef5fdeadf321f14f8b611c733031d54d Merged-In: Id06b2013ef5fdeadf321f14f8b611c733031d54d (cherry picked from commit ef7b1333f0e87cd07af115719b94dd37e2de54dc)
2020-10-02Snap for 6880396 from 467128aef528e1314f144d4e1d3be58202723f30 to ↵android-build-team Robot
rvc-qpr1-release Change-Id: Iaac5d68b2bbb5c46d7654447349c95f040007c6c
2020-10-02Merge "Update INTERNET perm state cache to use uids instead of appIds." into ↵Sudheer Shanka
rvc-qpr-dev
2020-10-02Merge "DO NOT MERGE Update the stable display frame for flexible insets" ↵Heemin Seog
into rvc-qpr-dev
2020-10-02Merge changes from topic "original-package-fix-rvc-qpr-dev" into rvc-qpr-devTreeHugger Robot
* changes: Handling removing <original-package> tag Revert "Handling removing <original-package> tag"
2020-10-02DO NOT MERGE Update the stable display frame for flexible insetsHeemin Seog
When using layoutStatusBar or layoutNavigationBar, the stable display frame is modified to take the system bars into account. However when we use flexible inset mapping, the stable display frame is not modified and causes issues in getLayoutHint() and potentially affects how dialogs are laid out. This change ensures that even system bars that use flexible inset mapping modifies the stable display frame as well. Bug: 168846852 Test: manual, atest DialogFrameTests WindowInsetsControllerTests InsetsStateTest InsetsStateControllerTest Change-Id: Ie89298eb98cf8c6bc9ada5494c544a3150b3b2de
2020-10-02Merge "Use normal rotation if orientation is changed by resume-scheduled ↵TreeHugger Robot
app" into rvc-qpr-dev
2020-10-02Use normal rotation if orientation is changed by resume-scheduled appRiddle Hsu
With traditional normal rotation, if an app calls Activity#setRequestedOrientation to change orientation in its onCreate or onResume, the system display info will be updated immediately. So if the app gets display rotation right after the orientation request, it can get the rotated result. While if fixed rotation transform takes effect for the case, though the rotated display adjustments will be sent to the app, it is too late that the app may have accessed the global display info which is not rotated, that may cause inconsistent UI layout if the app depends on the rotation info. Bug: 167564038 Test: DisplayContentTests#testNoFixedRotationOnResumedScheduledApp Change-Id: I3253264cb1bb8886074e88012582daa3589a1896 Merged-In: I3253264cb1bb8886074e88012582daa3589a1896 (cherry picked from commit 4d576bfa25b764b3d2dd44761f632e7962443b02)
2020-10-01Update INTERNET perm state cache to use uids instead of appIds.Sudheer Shanka
It really shouldn't have mattered whether we use uids or appIds for this cache but given the way NetworkPolicy iterates over all apps on the device (all_apps * all_users), it is possible that we end up checking the permission state of apps which are not installed on a user which will always be DENIED and we end up caching this. So, we could end up treating an app as not having INTERNET permission on a user even though it has. Also, update the cache stragety to always check with PackageManager when the permission state is denied in the cache just to be safe, until NetworkPolicy iteration of apps is fixed. Bug: 168299219 Test: atest cts/hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java Test: manual Change-Id: I6f2a60695a519a972c96ec8e053d3be5dc732461 Merged-In: I6f2a60695a519a972c96ec8e053d3be5dc732461
2020-10-01Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I96c71a04961157d579c0c0b19bc6436b168ea8de
2020-09-30Snap for 6875707 from 0c52a7600f6cb1c35ab047d4ca78747693c52eda to ↵android-build-team Robot
rvc-qpr1-release Change-Id: Iba131a070eda4b202dcae75a89ee2758227e5704
2020-09-30Merge "Fix un-dismissable incoming call for auto-rejected calls" into ↵Radhika Agrawal
rvc-qpr-dev
2020-09-30Handling removing <original-package> tagPatrick Baumann
This reverts commit I7b9d3c786d653a9b00a553e89d7390bcef45c0f2. Fixes: 169414761 Test: Manual Test: Add package A Test: Verify package A exists Test: Remove A, add package B w/ original-package A Test: Verify package A exists, but codepath is to package B Test: Replace package B w/o original-package A Test: Verify package A removed and package B added Change-Id: I198ca545f4fea3ae9d2328a845cbd9167eedf8da
2020-09-30Revert "Handling removing <original-package> tag"Patrick Baumann
This reverts commit 27c28b94283b491c58d5981fc580cd89e5c251c5. Reason for revert: Adding verification method. Bug: 169414761 Change-Id: I7b9d3c786d653a9b00a553e89d7390bcef45c0f2
2020-09-29Snap for 6872792 from 2ca98d205756ab6d944558c20ee4d950717ac472 to ↵android-build-team Robot
rvc-qpr1-release Change-Id: I25644071a8361d042aa159f8208369b2fcb1d062
2020-09-29Fixes PM.grantImplicitAccess for multi-userPatrick Baumann
This change fixes the security check in grantImplicitAccess to support the case that the system user does not have an installed contacts provider. Fixes: 169684344 Test: atest android.provider.cts.contacts.ContactsContract_DirectoryTest Change-Id: I2c80513a5dffa7ad92963e376ea85217f127f39a
2020-09-29Merge "Add read/write logic for SubscriptionPlan network types field" into ↵Sarah Chin
rvc-d1-dev am: 76b7c3ccb4 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12691247 Change-Id: Ib69dce5f5a5e6e463544070794da7ce9b76aeea5
2020-09-29Merge "Add read/write logic for SubscriptionPlan network types field" into ↵Sarah Chin
rvc-d1-dev
2020-09-29Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 ↵TreeHugger Robot
am: 794e42e566 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676 Change-Id: Ibf40686e0076d97fe22a970a4695a86fb3cf150a
2020-09-29Merge "LINK_CONFIGURATION_CHANGED broadcast: stop including ↵David Su
EXTRA_LINK_PROPERTIES" into rvc-qpr-dev
2020-09-29Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676 Change-Id: I0ba79c5a129932dd805bb3dbda49f58702631d3d
2020-09-29Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-devTreeHugger Robot
2020-09-29Merge "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted ↵Charles Chen
displays"" into rvc-dev am: 5c393cb830 am: f9c533aae6 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12716107 Change-Id: I5782a34de3a578e72c9bfd8ccb95d835dc78f0c2
2020-09-29[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays" ↵Charles Chen
am: ae03031efe am: 6c079ef0b5 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12716107 Change-Id: I306a382fa9ae3b9abc096c343316365c6a6ce8dd
2020-09-29Merge "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted ↵Charles Chen
displays"" into rvc-dev am: 5c393cb830 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12716107 Change-Id: I9fb1e26c8f58617fc330042888141717dc6c9192
2020-09-29[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays" ↵Charles Chen
am: ae03031efe Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12716107 Change-Id: If1a42b8cd7cab0c97f45fc3f452dbe4bc054cf41
2020-09-29Merge "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted ↵Charles Chen
displays"" into rvc-dev
2020-09-29[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"Charles Chen
This reverts commit f21c885ca7e86f77c808ab17fe1de650474de487. Reason for revert: Have regression b/168268396. Needs to pull out from Nov. builds. Bug: 162627132 Change-Id: I29fa3937d1655a0cc7591abcfa2067f4fb2b2bcb
2020-09-28Merge "Handle IME when target moves between splits" into rvc-qpr-devTreeHugger Robot
2020-09-28Snap for 6869386 from f54a2f3e49ce55e2287240105a4858695940ab4a to ↵android-build-team Robot
rvc-qpr1-release Change-Id: I49423544996e4644a9afc161cfae975bd3d20794
2020-09-28Fix un-dismissable incoming call for auto-rejected callsBrad Ebinger
When the device receives an incoming call indication and quickly receives another call terminated indication (such as the auto reject case), there is the possiblity that the call terminated indication happens while onIncomingCall is still being processed. This is due to the fact that binder oneway calls are only guaranteed to be on the same binder thread for the same IBinder node. Since these callbacks are happening on two separate nodes potentially, there are running in two binder threads at the same time, causing race conditions. Instead, the onIncomingCall binder call should not be oneway (as it is required to complete before other indications should occur) and only return control back to the ImsService thread once the MmTelFeature#notifyIncomingCall call completes. Bug: 160213239 Test: incoming call, auto-rejected incoming call on MSIM Change-Id: I054e6b00656fc04f48f7f378076e29322daf59ad
2020-09-28Merge "DisplayImeController: reapply visibility when leash changes" into ↵Adrian Roos
rvc-qpr-dev
2020-09-28Merge "RESTRICT AUTOMERGE Reland "Fix showing keyboard without editor ↵Ming-Shin Lu
focused.."" into rvc-qpr-dev
2020-09-28Merge "Update device name on audio info changed" into rvc-qpr-devTreeHugger Robot
2020-09-28RESTRICT AUTOMERGE Reland "Fix showing keyboard without editor focused.."Ming-Shin Lu
Resolve SearchViewTest and InputMethodServiceTest failure when landing CL[1] in QPR branch. Also, CL[1] mentioned window focus behavior changes from R, ignoring STATE_VISIBLE or STATE_ALWAYS_VISIBLE request doesn't enough to fix unexpected keyboard visible issue when same window focused with the above softInput flag without editor focus, since there is no additional unspecified window focus to hide the current soft-input as prior to R's behavior. To fix that, we introduced new SoftInputShowHideReason to hide soft-input when the same window focused without valid editor focus after screen unlock, in order to align with the behavior prior to R. [1]: I37ae6e30d1de581ba15131c2a90396b3a522a4d6 Bug: 161506356 Test: atest CtsInputMethodTestCases Change-Id: Id51863a5b67d5d79d903adf43f19b52bd139e03f
2020-09-28Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-devTreeHugger Robot
2020-09-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ic65e6083cec0267a6474ea5715426b4dc4bf4e44
2020-09-27Snap for 6867210 from b381de4cd0141c56135e7a36cfd047dca7175852 to ↵android-build-team Robot
rvc-qpr1-release Change-Id: Iefa6871e74d5cd8d3fc1c4eeda13935585091efa
2020-09-27Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-devTreeHugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 19:00:22 +0000