summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-16Merge cherrypicks of [7077329, 7077440, 7077330, 7077468, 7076852, 7077469, ↵android-9.0.0_r41android-9.0.0_r40pie-qpr3-s1-releaseandroid-build-team Robot
7077580, 7077581, 7077582, 7074025, 7077706, 7077707, 7077708, 7077388, 7077583, 7077584, 7077585, 7077726, 7077727, 7077331, 7077332, 7077459, 7077709, 7077710, 7077711, 7077712, 7077460, 7077461, 7077333, 7077334, 7077696] into pi-qpr3-release Change-Id: I7388064ae931f71c9df3bf2f5300417a85270cfb
2019-04-16Add cross user permission check - areNotificationsEnabledForPackageJulia Reynolds
Test: atest Fixes: 128599467 Change-Id: I13a0ca7590f8c4b44379730e0ee2088aba400c2a Merged-In: I13a0ca7590f8c4b44379730e0ee2088aba400c2a (cherry picked from commit 657d164136199126ae241848887de0230699cea0) (cherry picked from commit 63846a7093ca7c6d89b73fc77bdff267b3ecb4ef)
2019-04-16Limit IsSeparateProfileChallengeAllowed to system callersPavel Grafov
Fixes: 128599668 Test: build, set up separate challenge Change-Id: I2fef9ab13614627c0f1bcca04759d0974fc6181a (cherry picked from commit 1b6301cf2430f192c9842a05fc22984d782bade9)
2019-04-16Added missing permission check to isPackageDeviceAdminOnAnyUser.Varun Shah
Added a check for the MANAGE_USERS permission to PackageManagerService#isPackageDeviceAdminOnAnyUser. To test that the method is still usable: 1) Enable virtual storage via: adb shell sm set-virtual-disk true 2) Follow instructions by clicking on notification to set up virtual storage 3) Go to Settings -> Apps & notifications -> See all X apps 4) Click on any non-system app (example Instagram) 5) Tap Storage and you should see a "Change" button (if not, choose another app) 6) Tap Change and you should see Internal and Virtual storage options listed 7) The above step confirms the method is still usable by Settings Bug: 128599183 Test: SafetyNet logging (steps listed above) Change-Id: I989f1daf52a71f6c778ebd81baa6f1bf83e9a718 Merged-In: I36521fa43daab399e08869647326a7ac32d1e512 (cherry picked from commit 18e7dedf6c35f07daf8b7239d501737745ac7f43)
2019-04-16DO NOT MERGE Atoms: Add BluetoothClassicPairingEventJack He
* Add BluetoothClassicPairingEvent to log pairing and encryption related statistics Bug: 124301137 Test: test drive with statsd Change-Id: Idca6f6d340e03af91c5a6fb4102666d44167635b (cherry picked from commit 6110c95184c6ca0265ebc39235ca81da21c0483d)
2019-03-13Merge cherrypicks of [6716922, 6716923, 6716413, 6717023, 6717024, 6716716, ↵android-9.0.0_r37android-9.0.0_r36android-build-team Robot
6715859, 6717160, 6717161, 6717162, 6717163, 6716295, 6717141, 6717181, 6717183, 6717184, 6717185, 6714937, 6717028, 6716717, 6716927, 6717200, 6717029, 6717030, 6717031, 6717032, 6717033, 6716928, 6717034, 6717035, 6716929, 6717201, 6716930, 6712377, 6712378, 6716643, 6717164, 6712379] into pi-qpr3-release Change-Id: Ia3d03b5e53706f20e820855188ce81adb6b8aa97
2019-03-13DO NOT MERGE: Don't let previous activity wait if next activity won't be visibleTiger Huang
If the next resumed activity won't be visible because of keyguard, it doesn't make sense to let the previous activity wait for the next activity becoming visible. Worse, it would make other activities going to the stopped state need to wait unnecessarily. Bug: 125550126 Bug: 124556520 Test: atest ActivityManagerDisplayLockedKeyguardTests Change-Id: Id6f2e562c84b167b6736813ea6dc183536587d30 (cherry picked from commit b0de585dece94c1d17ea5daf9eb52265670e4826)
2019-03-13DO NOT MERGE Add carrier config to use 3GPP application on CDMA/CDMA-LTE phone.mavishsu
Bug: 124524824 Test: atest GsmCdmaPhoneTest Change-Id: I002ece2bae63c1ce578a822f9961220ba1971557 (cherry picked from commit 04d262db157f15c2d822708e57715d80e3f14585)
2019-03-13Revert "Update VPN capabilities when its underlying network set is null."Varun Anand
This reverts commit ad8805a6c217338b12511f220cce22211a19080a. Bug: 126245192 Reason for revert: This change can lead to a deadlock that was fixed in http://ag/6580635. However, platform PMs think that fixing this is risky enough as this is not a recent problem and has been in the field for 3/4 of the year. Note: The merged-in tag is used to avoid this change from getting merged into pi-dev-plus-aosp. This is to avoid merge conflicts since we mostly work in aosp/master which merges into pi-dev-plus-aosp. Change-Id: I3814bcec87efb059f50f00617406501aaeac3b4d Merged-In: Id0abc4d304bb096e92479a118168690ccce634ed (cherry picked from commit 6a050c7c50fa0838d7e29b8c6e244018044246db)
2019-03-13DO NOT MERGE - SUPL ES Extension - Safer Init and Not After BootWyattRiley
Safe order of pointer setting and background thread start Verifying mCallEndElapsedRealtimeMillis is not the initial value Bug: 112159033 Bug: 115361555 Bug: 125124724 Test: Verified not-after-boot with test code b/115361555#comment14 Test: Reproed NPE with test thread sleep and verify fix Change-Id: I25dcd5a5b36c218ea8b7ab88d6909382709fd7ab (cherry picked from commit fbcb41f9fbc4e91e023f3103a391182600312ef7)
2019-02-27Snap for 5339334 from cd8eace91d4b3b2c3de29304f226dbefa9214216 to ↵android-build-team Robot
pi-qpr3-release Change-Id: Ied7bc8e2a9c318dd17cf4bc32aa213187c96ace2
2019-02-26Merge "DO NOT MERGE: Disable night UI mode in battery saver." into pi-devTreeHugger Robot
2019-02-26DO NOT MERGE: Disable night UI mode in battery saver.Dan Sandler
Apps are simply not ready for this. Bug: 122968431 Test: Toggle battery saver; confirm that a config change is not generated Change-Id: I792d42e31254c8189e95c3f076b9eaea893209a6
2019-02-22Merge "Revert "Fix a11y cache correctness bug"" into pi-devQasid Sadiq
2019-02-22Merge "Visualizer: fix native crash when visualizer release" into pi-devMikhail Naganov
2019-02-22Visualizer: fix native crash when visualizer releasezengjing
Visualizer should not be destroyed before mCaptureThread exit. Bug: 124833084 Test: CTS VisualizerTest Change-Id: I0cda2ff2be8ce487e10b5311fbdc043fa57d91d4 Merged-In: I0cda2ff2be8ce487e10b5311fbdc043fa57d91d4 Signed-off-by: zengjing <zengjing@xiaomi.com>
2019-02-22Merge "DO NOT MERGE Fix flaky tests in OverheatAlarm feature" into pi-devBill Lin
2019-02-21Revert "Fix a11y cache correctness bug"Qasid Ahmad Sadiq
This fix introduced a painful crash that ends up disabling accessibility services for certain users. This happens when a client of AccessibilityCache tries to add a node, with the same id as a node previously in the cache, but fewer children, where the removed child is not in the cache. This is because, when children are removed, and a the node is updated, the cache tries to clear the child trees. But if the child is not in the cache, the cache clears the whole tree. Every node is recycled. Then the original node being replaced is attempted to be recycled again, and voila crash. The fix also didn't fix the original issue based on the discussion in b/114133438. The risk for this is pretty low, since nothing was built on top of this. This reverts commit 2f69c16c3dd0ea9522deebd9141ccc189b4a118e. Bug: 124676705 Test: Tested to see if above usecase still happens. Change-Id: I8a39698c4532a1613ba47e1c6ca70201cd496212
2019-02-22Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2019-02-21Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: If0bc0cddb97e786602b5be83f1a165ad6c94ef9c
2019-02-21Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2019-02-21Merge "Skip empty slice permissions files during backup" into pi-devDaniel Sandler
2019-02-21Merge "Make notifications from the default dialer and SMS app unblockable." ↵Daniel Sandler
into pi-dev
2019-02-21Merge "Clarify WebResourceResponse's stream handling." into pi-devTreeHugger Robot
2019-02-20Merge "Improve the performance when loading image wallpaper colors" into pi-devLucas Dupin
2019-02-20Merge "Override old alarms in zen schedule" into pi-devTreeHugger Robot
2019-02-20Merge "Update VPN capabilities when its underlying network set is null." ↵TreeHugger Robot
into pi-dev
2019-02-20Update VPN capabilities when its underlying network set is null.Varun Anand
Previously, they were only updated when underlying network set was non-null. This change also ensures that all the calls b/w ConnectivityService and Vpn that leads to updating capabilities are on ConnectivityService handler thread. Additionally, it also ensures that capabilities are propagated after VPN enters connected state. This change also updates VPN capabilities inline from ConnectivityService handler thread. Previously, there was an additional loop where Vpn would update capabilities via NetworkAgent thru AsyncChannel which posts back to CS handler thread, which could potentially lead to delays in updating VPN capabilities. Bug: 119129310 Bug: 118856062 Bug: 124268198 Test: atest FrameworksNetTests Test: manual - verified VPNs capabilities are getting updated and DownloadManager is working correctly. (cherry picked from commit 4fa80e8a2f03557221e0371a987e780df7788faa) Change-Id: Iae5f2024b19df04c31938815b52687781d016cde Merged-In: Id0abc4d304bb096e92479a118168690ccce634ed
2019-02-20Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: I0dbe18bb869d94b281c80f9514a99f5fdb35a089
2019-02-20Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2019-02-20Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2019-02-20Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2019-02-20Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2019-02-20Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: Id0e3afb74226f19cf422bdc5e33455a195676055
2019-02-19Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: I1e9a93f1b40f89db42865246b67fdea660184808
2019-02-19Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: I106603e2d97492c9c95bab4e6b65ccb6d040ee9c
2019-02-20Snap for 5322077 from 5a50cb42b7e22ded08047524464fa360647b2785 to ↵android-build-team Robot
pi-qpr3-release Change-Id: I4475a2045dc9df43da24f96bb9502a024c82fc8e
2019-02-20Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2019-02-19Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: Idb887c01b8b6d9dd1fbb282306d2b140e65c50eb
2019-02-20Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2019-02-20Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2019-02-20Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2019-02-20Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2019-02-20Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2019-02-20Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2019-02-20Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2019-02-20Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2019-02-20Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2019-02-19Merge "[DO NOT MERGE] AML: Handle NoDisplayActivities correctly" into pi-devTreeHugger Robot
2019-02-19Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: I01b16b7e400b569350aad675ab5f75bd28dac24c