summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-18Merge cherrypicks of [16105251] into sc-qpr1-d-release.android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseAndroid Build Coastguard Worker
Change-Id: I12e9b9d31cffde5c38341457df041c56fc90882a
2021-11-18Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I782cb1bd08a0b2bb4c2caf293e1119d59e21f5dc (cherry picked from commit eed6614c73a23dd37f5dd1e98b7814e054fa9339) Merged-In:I782cb1bd08a0b2bb4c2caf293e1119d59e21f5dc
2021-11-13Merge cherrypicks of [16191693] into sc-qpr1-d-release.Android Build Coastguard Worker
Change-Id: I1ccf0cf773124ca669f9b11a94cd9585cd320bb0
2021-11-13Fix normalize doesn't work on carrier templateLes Lee
From android 12, the subscriberId is being used for different network types. For instances: The TYPE_WIFI with subscriberId means that it is a merged wifi network. The TYPE_CARRIER means that the network associate to specific carrier network (subscriberId). So remove the check "isMatchRuleMobile" and only check whether subscriberId is being used in NetworkTemplate or not. Bug: 194939211 Test: atest -c NetworkTemplateTest Change-Id: I80c9f887cf8b4714716d657da92ed273a532ce27 Merged-In: I80c9f887cf8b4714716d657da92ed273a532ce27 (cherry picked from commit 46cc261aa90305bdfec668af5d5ed25a27032cda) Merged-In:I80c9f887cf8b4714716d657da92ed273a532ce27
2021-11-10Merge cherrypicks of [16086468] into sc-qpr1-d-release.Android Build Coastguard Worker
Change-Id: I64de3b2ae7a975066233e49c3b8fde5e542f4f89
2021-11-10[RESTRICT AUTOMERGE] Hide Wi-Fi Scanning message when Location is disabled ↵Weng Su
(QS Internet Dialog) - When the location is disabled, the WiFi scanning service will also stop. - Bypass the WifiManager#isScanAlwaysAvailable() result. Bug: 203471614 Test: manual test on the device. atest -c InternetDialogControllerTest \ InternetDialogTest Change-Id: I2f159820d577f226e640b3ea735f6b18c52a16f7 (cherry picked from commit 194a61951688b8ed48b6c0e254398f66c5b1d79a)
2021-11-10Merge cherrypicks of [16065658, 16200130] into sc-qpr1-d-release.Android Build Coastguard Worker
Change-Id: I92e7c2ea51784f9bdc3b64ed2e936bf750d1438e
2021-11-10[DO NOT MERGE] Revert "Fixed the performance of unlocking when dozing"Matt Pietal
This reverts commit 87e83cd7664a689512b7bbafb5f79f00a55501ea. We are forward fixing in sc-v2-dev Reason for revert: b/205193749 Change-Id: I9c26643bcfbd37fb36d610291e883112e680e308 (cherry picked from commit d4a2e7c9a5fdacb54750396c22acbe451decfa3d)
2021-11-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I906d64bc6ec9001b40af4cf4d90c9f4ca45aca89 (cherry picked from commit 7e142ec17bd1f4ea4423bcb4a4850434b783188c)
2021-11-05Merge cherrypicks of [16174752, 16174880, 16170299] into sc-qpr1-d-release.Android Build Coastguard Worker
Change-Id: I5b745d8caf808dd9b8a385a6c3601ce9c616d66c
2021-11-05Use SystemUI theme to inflate FrameLayout and SplashScreenViewwilsonshih
The FrameLayout and SplashScreenView are only used as container in StartingSurfaceDrawer, so they do not need to be inflated by app's context, which could be affected by app's resources. Bug: 197936273 Test: cold launch test app and show splash screen. Test: launch several apps to verify that everything is fine. Test: atest StartingSurfaceDrawerTests Change-Id: I6de444546b5dfba23fc1d7c9c4deb12787d667c5 Merged-In: I6de444546b5dfba23fc1d7c9c4deb12787d667c5 (cherry picked from commit c86f1eb19e2578073849118fe1e81f694d5fae4b) (cherry picked from commit 85313e73faa7275bcd0e95c25ca2f3104f5ca94f)
2021-11-05Ensure we clear mPackagesWithShareRequests when a remote exceptionSergey Volnov
happens at write() or start(). Bug: 203784652 Test: atest CtsContentCaptureServiceTestCases Change-Id: I35d8c8056dc126c44f03b74a04090861224a9407 (cherry picked from commit 39d8062aec7c5e9938aff089618b50540b0bdbd3) (cherry picked from commit 063fe636baa723206960a2c3f3ae833daa9b9b77)
2021-11-05Ensure end action is called if keyguard animation is cancelledBeverly
Else, the dozing state may be inaccurate which will cause aod-buggyness Test: manual, builds and transition to AOD still works Bug: 202630143 Change-Id: I57af55792db76552d3f991204b185a9472abea58 Merged-In: I9984863d0acea1265d09dfcfac22d5e78c73a1fe Merged-In: I57af55792db76552d3f991204b185a9472abea58 (cherry picked from commit 0f63fa265b6999b6ffed8ce1c532dc19342dbfb7) (cherry picked from commit 9b971d6e1b4f538342568fb9faf0f89391a8a90f)
2021-11-02Merge cherrypicks of [16141748, 16140010, 16150137] into sc-qpr1-d-release.Android Build Coastguard Worker
Change-Id: I8a2a42d64dcb37d397d39b24d2de2684ce95f6b9
2021-11-02Add config to detect e-call call based on dialed sim emerg # list.Tyler Gunn
We normally use the combined emergency number list from the emergency number lists of both sims when placing emergency calls, with the provision that the routing may be unspecified if a dialed number is an emergency number on one sim but not the other. This config allows a carrier to mandate that calls are only treated as an emergency call on their network based on their own emergency number list. Test: TBD Bug: 203947159 Change-Id: Id5cd4123f1bb7bdd85e564fc6997dfbc50652a5f (cherry picked from commit 11dd6452d6621328b0bd430eeebacb55fd478cf3)
2021-11-02Fixed an issue where using UDFPS always dismissed the shadeSelim Cinek
Because we were only checking for the bouncer to be shown and not the alternative auth interceptor, the unlock mode always ended up being unlock_collapse instead of dismiss_bouncer. The isBouncerShowing() was already taking into account the alternative auth path, but the bouncerIsOrWillBeShowing() didn't Fixes: 204049350 Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java Merged-In: Id8bf8460bff26ec5694c82466ea63e3cdf61216e Change-Id: Id8bf8460bff26ec5694c82466ea63e3cdf61216e (cherry picked from commit 571fdde909a333a3486d93ac94c677da787b4413)
2021-11-02[DO NOT MERGE] Handle IllegalStateException in APM event handling.Joy Babafemi
Test: Manual Bug: 204003158 Change-Id: I8cf2b091b9f323079f54a38dfc9ddfc8af512a43 (cherry picked from commit 7bde0926f7259ab96fd2a313101aa4901fb6b29a)
2021-10-26Merge cherrypicks of [16024420] into sc-qpr1-d-release.Android Build Coastguard Worker
Change-Id: I08dd0f721191ea2eccd0447aad85d8d898e8f5d5
2021-10-26Fixed the performance of unlocking when dozingSelim Cinek
When unlocking from pulsing, we would go to the keyguard in the middle of the animation. We're now delaying that update until the reveal animation has finished to hide the giant jank of leaving the lockscreen. Test: atest SystemUITests Bug: 197113783 Merged-In: Iebefca3a1810a498654cad0e461532a5d9f7d0af Change-Id: Iebefca3a1810a498654cad0e461532a5d9f7d0af (cherry picked from commit 87e83cd7664a689512b7bbafb5f79f00a55501ea)
2021-10-19Merge cherrypicks of [16033980] into sc-qpr1-d-release.Android Build Coastguard Worker
Change-Id: I631f05155cf2500fcffb270b376ab8c2faf58c16
2021-10-19[SystemUI] 1.Remove the unnecessary log 2. update signal icon in bg threadZoey Chen
1. The log should be controlled by the DEBUG, otherwise it will be printed infinitely and the performance will be very slow. The log can be removed after checking, so I removing it instead of adding the DEBUG tag. 2. Do too much get icon in the main thread, move it into bg thread 3. It is unnecessary that update the mobile data layout from the callback, onAccessPointsChanged, because it is used for Wi-Fi. Bug: 201200079 Test: manual and Q verified pass Change-Id: I5f4623f9ffb68fae6ca377625aaa039f0f33dd38 (cherry picked from commit 5a1bb06a0a8d6d730714f02826ab957a4cc220c7)
2021-10-16Snap for 7829835 from 151103c7578f7f13df3d70b7b09d89b1f93300db to ↵Android Build Coastguard Worker
sc-qpr1-d-release Change-Id: I3020b4d6e2e2a501bb97e62608d945cbf5a2cda1
2021-10-15[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-dev am: bb0d270c5c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16061648 Change-Id: I1bbc71ee0a1b65ba67ccfa0f9150204296fee1ae
2021-10-15Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devTreeHugger Robot
2021-10-15Merge "[RESTRICT AUTOMERGE] Add Wi-Fi Scanning notify to QS Internet Dialog" ↵TreeHugger Robot
into sc-qpr1-dev
2021-10-15[automerger skipped] Merge changes I2440a161,I3e478b11 into sc-dev am: ↵Nader Jawad
ce6d9b4261 -s ours am skip reason: Merged-In I2440a161c70076850479c562c7c9e6dc8d756236 with SHA-1 74eaabead9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16051823 Change-Id: I782e9fa192828095dbef24d8ccfefe66c47c5d6d
2021-10-15Merge changes I2440a161,I3e478b11 into sc-devNader Jawad
* changes: Fix initialization of snapshot SkImage instance Conditionally cache RenderEffect results
2021-10-15Merge "Update the BroadcastQueue logic for runtime permissions" into sc-qpr1-devTreeHugger Robot
2021-10-15Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-devTreeHugger Robot
2021-10-15Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I18901232690d8e415369655a9b25b0ebcc3bb54f
2021-10-15Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I7e5713a1d25c4054e7f8f430a68a0544a4ff18f2
2021-10-15Update the BroadcastQueue logic for runtime permissionsAshwini Oruganti
Previously, we were skipping a broadcast when either the permission or the app op was granted. However, for runtime permissions to be considered "granted" both the permission and the app op need to be granted. This change updates taking this into account. Test: manual Bug: 202436287 Bug: 183537857 Change-Id: I9f12f9e17e61246d723d18ead93c6115bbf6d5cf Merged-In: I9f12f9e17e61246d723d18ead93c6115bbf6d5cf (cherry picked from commit 1e6a9681266986e1d8ceba55646199c02223c7b8)
2021-10-15Snap for 7825665 from 80de4b8d1c1866b082f4f8ce3337c7039ea19ba8 to ↵Android Build Coastguard Worker
sc-qpr1-d-release Change-Id: Ib2e0de2f1e27f2c0feb9f7ac8492f0dc370bb41f
2021-10-14[automerger skipped] Merge "Disallow overlays for ResolverActivity" into ↵TreeHugger Robot
qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 6071b11999 -s ours am: 63c010460d -s ours am skip reason: skipped by user joshtrask Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137 Change-Id: I9ecb33a8ccc0f97617d48f5ff1e25ef57ae3970c
2021-10-14[automerger skipped] Merge "Disallow overlays for ResolverActivity" into ↵TreeHugger Robot
qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 7dacb9fb5e -s ours am: 241c81a614 -s ours am skip reason: skipped by user joshtrask Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137 Change-Id: Iec2e808c5f377429378e4f1d6dd4fb0a7f15cdf1
2021-10-14[automerger skipped] Merge "Disallow overlays for ResolverActivity" into ↵TreeHugger Robot
qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 6071b11999 -s ours am skip reason: skipped by user joshtrask Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137 Change-Id: I5c653d3d75eb94c07d79a6f50157e9ed6e5e8088
2021-10-14[automerger skipped] Merge "Disallow overlays for ResolverActivity" into ↵TreeHugger Robot
qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 7dacb9fb5e -s ours am skip reason: skipped by user joshtrask Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137 Change-Id: I1090649f7622af8613a34a1fce70cfbd3241953c
2021-10-14[automerger skipped] Merge "Disallow overlays for ResolverActivity" into ↵TreeHugger Robot
qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am skip reason: skipped by user joshtrask Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137 Change-Id: Ibcefc625d834c5d00275551ca20b164c77169052
2021-10-14[automerger skipped] Merge "Disallow overlays for ResolverActivity" into ↵TreeHugger Robot
qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am skip reason: skipped by user joshtrask Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137 Change-Id: Ice9c20b9018cead99a36c4126086fe360346516c
2021-10-14[automerger skipped] Merge "Disallow overlays for ResolverActivity" into ↵TreeHugger Robot
qt-dev am: f3661fc780 am: d4be365335 -s ours am skip reason: skipped by user joshtrask Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137 Change-Id: I3398972f2772e2a688d391b246bc9b121f7ea204
2021-10-14Fix initialization of snapshot SkImage instanceNader Jawad
Fix issue where the initial snapshot used to create a resultant SkImage instance with an SkImageFilter applied was not initialized. Fixes: 201312688 Test: Re-ran CTS tests Change-Id: I2440a161c70076850479c562c7c9e6dc8d756236 Merged-In: I2440a161c70076850479c562c7c9e6dc8d756236
2021-10-14Conditionally cache RenderEffect resultsNader Jawad
Added property to conditionally cache SkImage instances with SkImageFilters applied. Some GL vendor implementations invoke Fence::waitForver without signalling, leading to ANRs throughout the system. Bug: 193145089 Test: manual Change-Id: I3e478b11b66205d96e9499a362f7412a1d6e952d Merged-In: I3e478b11b66205d96e9499a362f7412a1d6e952d
2021-10-14Snap for 7821765 from 626348ae43f6927dd2bc9b17cf7a3f9810ccf119 to ↵Android Build Coastguard Worker
sc-qpr1-d-release Change-Id: Ia3ab98fda7c9efd65a183e6acb93bdb80f69efce
2021-10-13[RESTRICT AUTOMERGE] Add Wi-Fi Scanning notify to QS Internet DialogWeng Su
- Show message when Wi-Fi is OFF and Wi-Fi Scanning is ON - Don't show message when device is locked - Show a "Change" link to launch Wi-Fi Scanning Settings Bug: 202323013 Test: manual test to verify on the device. atest -c InternetDialogControllerTest \ InternetDialogTest Change-Id: I5eb4563a69e85050532c8b4fe3748e01cc7d9ca5
2021-10-13Merge "[RESTRICT AUTOMERGE] Add WiFi scan notify message (QS Internet ↵TreeHugger Robot
Dialog)" into sc-qpr1-dev
2021-10-13Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-qpr1-devTreeHugger Robot
2021-10-13[RESTRICT AUTOMERGE] Add WiFi scan notify message (QS Internet Dialog)Weng Su
Bug: 202323013 Test: add new string only, unnecessary to test. Change-Id: I54bc60793f317390a78ce1e9dc96ee31c861ad63
2021-10-13[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-dev am: 5a4e57d0ac -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16022271 Change-Id: I353acca24cdd094b9368b64f46d27d41168260b8
2021-10-13[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
7936d8bdfe -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16020286 Change-Id: Ib92952744abfbba772dc062672213d069a67f8da
2021-10-13[automerger skipped] Disallow overlays for ResolverActivity am: 978809e428 ↵Collin Fijalkovich
am: 157dea0ce9 -s ours am: 99338cc865 -s ours am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 718c60bea7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960136 Change-Id: I2ccffdd80181b9783d69f52dc2ce84df9e79f620