summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-23Merge cherrypicks of [12430011, 12431462, 12431358, 12430869, 12431463, ↵android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r11android-11.0.0_r10android11-d1-s1-releaseandroid-build-team Robot
12431135, 12431136, 12431137, 12430870, 12431248, 12431249, 12431208, 12431021, 12429312] into rvc-d1-release Change-Id: Ia43b73681d2cf541e6b290e9040ec5fc17625797
2020-08-23Skip RAT type listener registration if IMSI is not availablejunyulai
Currently, if SIM is inserted but IMSI is not available, such as SIM PIN locked state. Information of such SIM will still be available but IMSI is not. Which makes NetworkStatsSubscriptionMonitor failed to store IMSI locally for later RAT type query. Hence, NETWORK_TYPE_UNKNOWN is always returned for such SIM. Skip the registration until the IMSI is available. This is safe since there will be another onSubscriptionsChanged event when that happens. Test: enable SIM PIN and manually test Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdUnavailable Test: ./out/host/linux-x86/bin/statsd_testdrive 10082 Bug: 160941101 Merged-In: I408379b3c432d9e62e0837d6b4f6551cc7838e29 Change-Id: I408379b3c432d9e62e0837d6b4f6551cc7838e29 (cherry-picked from ag/12400327) (cherry picked from commit 6afd939ba562ca463c29db805646eba6fe4e4297)
2020-08-21Merge cherrypicks of [12424653, 12424634, 12424654, 12424655, 12424585, ↵android-build-team Robot
12424656, 12424657, 12424658, 12424659, 12424660, 12424661, 12424722, 12424723, 12424724, 12424725, 12424726, 12424511, 12424635, 12424636, 12424637, 12424638, 12424639] into rvc-d1-release Change-Id: Ice2681f95bb577af902fb937edb5a567b8afe151
2020-08-21Remove home snapshot immediatelyRiddle Hsu
If the size of snapshot is mismatched, the removal of the starting window will be deferred. But if the snapshot target is home, since it is only presented for unlocking, it is better to dismiss it as soon as possible to avoid outdated content from being shown on screen if the windows of home have drawn. Bug: 161530286 Test: Keep home on top and turn off screen with secured lock. Use fingerprint to unlock. If home is drawn fast enough, the previous state won't show on screen (e.g. the time on clock). Change-Id: I103f49eb539f78455ad38f48f9cd853dee51b135 (cherry picked from commit a17c813b4029602fa3f1c2c9baa6455845496106) (cherry picked from commit 106f745c3a13d172c0e4d9935861d060edb4a98f)
2020-08-20Merge cherrypicks of [12416577, 12417143, 12417185, 12417186, 12417187, ↵android-build-team Robot
12417188, 12416815, 12417147, 12417003, 12417004, 12417005, 12417006, 12417007, 12417008, 12417009, 12417055, 12415658, 12416578, 12417056, 12417057, 12417103, 12417104, 12417189, 12417033, 12417034, 12417190, 12417191, 12417192, 12417193, 12417058, 12417059, 12417060, 12417061, 12417202, 12417072, 12417073] into rvc-d1-release Change-Id: I77d854c809bed8be9828a273974326ef5fed7616
2020-08-20Refine system bar position restoringTiger Huang
The previous logic restores the system bar as long as its insets source is visible. There can be a timing issue that if the user swipes to show transient bars while an immersive app just becomes the control target but the hide-bar info haven't sent to WM yet, WM will re-show the bar incorrectly. This CL uses the requested visibility and the behavior to decide if we should restore the postion and the visibility. This CL also refines and caches the arguments of showTransient. In this way, we don't have to create the array every time while invoking that method. Fix: 161247175 Test: atest InsetsPolicyTest Merged-In: Idef314dfe6625399b88b3dacb4c74c7071453497 Change-Id: Idef314dfe6625399b88b3dacb4c74c7071453497 (cherry picked from commit 533682ebb39456df26097753d1f5172bff0e3d5d) (cherry picked from commit 444e8dc6ce224f87b4d062d697a6db5a62e11183)
2020-08-20[RESTRICT AUTOMERGE] Update the visibility of activities on sleeping displayJeff Chang
Activity with showWhenLocked flag is visible when screen is off and leads to activity restart called. This CL update the visibility condition for showWhenLocked and dismisskeyguard activities and refer the keyguard visibility to ensure the function works as expected. Bug: 161036653 Test: atest ActivityRecordTests atest CtsWindowManagerDeviceTestCases:KeyguardTests atest CtsWindowManagerDeviceTestCases:KeyguardLockedTests Change-Id: I9d56e40de964e9d11193fec7008f8d880028ac50 (cherry picked from commit 73d6c7926d2cdc39de617f7213fc85f303501f37) (cherry picked from commit 31fc73a70719ed9a07a9a865c71b602e2fd0c53e)
2020-08-20Correct the return value of applyAnimationLocked.wilsonshih
The starting window cannot be removed because it is waiting for the exiting animation finished, This may happen if the animation is not applied when #selectAnimation cannot find an appropriate animation. To make the state correct, the return result of #applyAnimationLocked should not only reference to the hierarchial animation state. Bug: 161847146 Test: atest WmTests Change-Id: I69bcd29f2587a3644485a0db05e622f6775cc82f Merged-In: I69bcd29f2587a3644485a0db05e622f6775cc82f (cherry picked from commit 48288a505dbcfc31a9a01f75dba24d5f62d428a4)
2020-08-20Update requested state after applying pending framesTiger Huang
When there is an insets animation, we will stop updating insets source frames until the animation is done. The previous logic didn't update the frames within the requested state while the animation is done. And the frames was relied by InsetsPolicy while playing transient bar animation. If the frames don't match the display, the insets would be wrong, and the animation wouldn't be played correctly. Fix: 161134197 Test: atest InsetsControllerTest Merged-In: Id8f3c1956fbfe3ad16f167ff76297dde6c634e81 Change-Id: Id8f3c1956fbfe3ad16f167ff76297dde6c634e81 (cherry picked from commit 23c75281ef0de8fb2b44fb93d8cf36ecf86454c7)
2020-08-19Merge cherrypicks of [12408287, 12406146, 12408322, 12407621, 12407777, ↵android-build-team Robot
12407778, 12407779, 12408288, 12408119, 12408120, 12408121, 12408342, 12408343, 12408344, 12408345, 12408346, 12408347, 12408348, 12407673, 12406215, 12408349, 12406235, 12406236, 12406237, 12406238, 12406239, 12406240, 12406241, 12408362] into rvc-d1-release Change-Id: Iaa5cf5e12b15d064f0c0b4484d377e0a3aa3163e
2020-08-19Dispatch insets to client if mState is changedTiger Huang
Previous logic in onStateChanged notifies insetsChanged based on the change of mLastDispatchedState, which can make us dispatch redundant insets changes to the app. In this CL, we only notifies insetsChanged if mState is really changed in onStateChanged -- we use the final mState (after updateState and applyLocalVisibilityOverride) to compare with the one before changing. Fix: 161924448 Test: atest InsetsControllerTest WindowInsetsControllerTests Test: Swipe up to home while IME open and see if there is any jank Merged-In: Ia536cdf76805caa56ca1b6eaf2b3db83b6ecd94e Change-Id: Ia536cdf76805caa56ca1b6eaf2b3db83b6ecd94e (cherry picked from commit f8175d1a5b276386037006a77d1df132774e9ed8)
2020-08-18Merge cherrypicks of [12401183, 12401133, 12401134, 12401135, 12401136, ↵android-build-team Robot
12401137, 12401040, 12401041, 12401262, 12401263, 12401264, 12401265, 12400619, 12400455, 12400456, 12400457, 12400458] into rvc-d1-release Change-Id: I73ade6c5759896aff617406ecfcf5043c34f20fb
2020-08-18Fix WiFi + "x" stil visibleEtan Cohen
The WiFi + "x" still seems to appear under some conditions - code path checking on changes in status not triggered correctly. Also remove one of the calls to the WifiManager#getCurrentNetwork. Partial fix to WifiManager#getCurrentNetwork blocking. Bug: 161011371 Bug: 163425287 Test: atest NetworkControllerWifiTest Test: visual inspection Change-Id: I112bdff85e905807c4e2826c127aeaedcdb03fd1 (cherry picked from commit 57855efc386a84dd8f8fc6cdb0cad4df4bf36f94)
2020-08-12Merge cherrypicks of [12361107, 12361089, 12361090, 12361091, 12361092, ↵android-build-team Robot
12361031, 12361032, 12361108, 12361109, 12361110, 12361145, 12360553, 12361111, 12361124, 12361112, 12361113, 12361146] into rvc-d1-release Change-Id: Idaae43e6c9c2b7e7fa6b28c0c82c80973ae07c53
2020-08-12Add 5G NSA to collapsed RAT types listjunyulai
Currently, getAllCollapsedRatTypes is used to retrieve all RAT types which will be recorded into NetworkStatsService. However, there is a missing part that 5G NSA virtual RAT type is not added into this list. This makes callers such as statsd do not aware of 5G NSA RAT type and missed to collect data usage of it. Test: atest NetworkStatsSubscriptionsMonitorTest#test5g Test: adb shell cmd stats pull-source 10082 Test: ./out/host/linux-x86/bin/statsd_testdrive 10082 Test: atest UidAtomTests#testMobileBytesTransfer \ UidAtomTests#testMobileBytesTransferByFgBg \ UidAtomTests#testDataUsageBytesTransfer Bug: 163021464 Change-Id: I0faeda20f0506a48ac1131b234c5fc40d95dfbe0 Merged-In: I0faeda20f0506a48ac1131b234c5fc40d95dfbe0 (cherry picked from commit d75a22bc20675e478b8d230b3db3ab69eb91d9f2)
2020-08-12Resume next activity if pausing app diedRiddle Hsu
If the top activity is crashed before showing any window, when its process reported dead, it will be regarded as no visible activity and no need to resume next activity. That may lead to the next top activity remains in paused state and may be unresponsive. Bug: 159951007 Test: atest ActivityTaskManagerServiceTests# \ testResumeNextActivityOnCrashedAppDied Change-Id: I635fceb9cf7b782f6ffbb9ebef7cb69053f64a0b Merged-In: I635fceb9cf7b782f6ffbb9ebef7cb69053f64a0b (cherry picked from commit f2e7da7a641ae6bf2b49fa487cc56e6fe20b3336) (cherry picked from commit 9c62ef63fdafcb806c0ca8486429fc44bd9454ea)
2020-08-12Shorten month on AOD dateLucas Dupin
Test: visual Fixes: 161186825 Fixes: 163309955 Change-Id: I8e62eef0f32812380bc1d19d87d7611bd395eabb (cherry picked from commit e5f5be9fd24cf4fa79839172029c078f76195e52)
2020-08-12Change date format for better 'ja' compatibilityLucas Dupin
eeeMMd doesn't properly translate dates in Japanese. According to ICU team, we should be using EEEMMd instead. The date output will be different in ja, ko, th out of 728 locales. Test: visual Fixes: 161186825 Change-Id: Ib551d532f08b89be3a0679c44c51b65f493f1a65 (cherry picked from commit 18bd42434f8c0d6624650e3accffe01f6cf7184a) (cherry picked from commit 83f4bc398ec6d6cfe1f8d0b243ecaceb484d6f3b)
2020-08-11Merge cherrypicks of [12350857, 12350967, 12350494, 12350813, 12350814, ↵android-build-team Robot
12350816, 12350695, 12350858, 12350984, 12350985, 12350908, 12350696, 12350697, 12350909, 12350859, 12350860, 12350861, 12350910, 12350564, 12351002, 12350817] into rvc-d1-release Change-Id: Idafd10fc0aaca207d2e0f5bbaa57c1ca2ac7d43a
2020-08-11Fix fd leak in KeepaliveTracker.Lorenzo Colitti
The semantics of FileDescriptor in AIDL are that the callee must close the file descriptor it receives manually. Fix: 157789860 Bug: 155136951 Test: treehugger Change-Id: Ice9fc9abe2959a84ad138a95c900dff676653665 Merged-In: Ice9fc9abe2959a84ad138a95c900dff676653665 (cherry picked from commit db8ae41da255caad7640fc2c1b58d16aafb0e62b) (cherry picked from commit e5a64d49da480f419aaf4424dda094763089d121)
2020-08-11Make non-blockable notification more robustJulia Reynolds
By keeping track of them in preferenceshelper, so they can be applied to apps/channel settings created on the first boot post a factory reset Test: atest Bug: 140893722 Change-Id: Ied7d66bd4ca59f831fc77eff3ef6030a1ad8d6f7 (cherry picked from commit 204b391fc250262ee95f2ecb8ef3c2d3fcb18291) (cherry picked from commit 046114dc687358eecfcb8a4a83013e459906d2cc)
2020-08-10Snap for 6749551 from 62c3a4f46b073109ad988d6e19776fe902e74658 to rvc-d1-releaseandroid-build-team Robot
Change-Id: Ifece461831a28aedf617c114267c9803d11b57e4
2020-08-09Merge "Do not leak dump objects." into rvc-d1-devTim Murray
2020-08-09Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-devTreeHugger Robot
2020-08-09Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-devTreeHugger Robot
2020-08-09Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I231323075ed55d149dbbcb8d02d8ed7cb3380aea
2020-08-09Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ib355ffc91b507ce25507bb5a75a12c17155ac1d5
2020-08-08Snap for 6748567 from 82993ac9378ba5f1a9e6f1bcfead8879a6b1ac0b to rvc-d1-releaseandroid-build-team Robot
Change-Id: I3c40933a3a396a064d6ee3d11e286d5e24c09aad
2020-08-08Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-devTreeHugger Robot
2020-08-08Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-devTreeHugger Robot
2020-08-08Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I5cdb4ae0d333cbf58312e160b19d5c65128adb15
2020-08-08Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ia867d8eca71ec0437072b2e2353348a726d7e9a9
2020-08-07Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I3b8a3c9db6d78347404870b64cdd622f9ec94109
2020-08-08Snap for 6747166 from 1315f1105e22066579f009facf60bc538d21d9fd to rvc-d1-releaseandroid-build-team Robot
Change-Id: Ia2f2d5d765fdac515751afee9b09537f64482ec1
2020-08-07Support dispatchNullEvent virtual methodAlec Mouri
Added for AChoreographer in I66abc2e28e60f06987ce3a54be294c94b77524fc Bug: 154874011 Bug: 158680912 Bug: 161406626 Test: builds Change-Id: Iac1f8eafc4d25a5a7c8b6d8eed3f6686705fc2fb Merged-In: Iac1f8eafc4d25a5a7c8b6d8eed3f6686705fc2fb
2020-08-07Do not leak dump objects.Florian Mayer
Bug: 163024455 Change-Id: Ia0710c3462f03a85bc22aaac7b190961da1f8be3 Merged-in: I9c1737647d762f478c0e452e5b72f98ec3d43c28
2020-08-07Merge "Skip loading tiles from non-current user if primary profile only" ↵Yanting Yang
into rvc-d1-dev
2020-08-07Merge "Add updatable-media jarjar rules to framework-all" into rvc-dev am: ↵Santiago Seifert
a52141c6ca Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12324556 Change-Id: I59a2a2cec54d286299be1048db602e6c9c4071b0
2020-08-07Merge "Add updatable-media jarjar rules to framework-all" into rvc-devSantiago Seifert
2020-08-07Skip loading tiles from non-current user if primary profile onlyYanting Yang
Symptom: Disabling an injected activity or provider can't remove the tile entirely. The tile is still shown if the device has a work profile. Root cause: Settings loads tiles from all injected components of all users via PackageManager. When an injected app disables its component of current user to remove tiles, the component for the work profile user is still enabled. Therefore the tiles are still loaded. Solution: Skip loading tiles from non-current user if the injected component is tagged "primary_profile_only". Bug: 161885575 Test: make RunSettingsLibRoboTests Change-Id: I00338204ddccfcbcf84a3eed34e6b8f8d5829d56
2020-08-07Merge "Allow Power-button to temporarily ignore proximity sensor." into ↵Santos Cordon
rvc-d1-dev
2020-08-07Resolve the endpoint in legacy VPNChalard Jean
This adds code to resolve the endpoint in the legacy VPN runner if it was specified as a hostname, and enables the previously added test that was disabled because this was broken until this patch. See the linked bug for details. This patch uses the async DNS API to do the resolution. This lets the resolution be fully cancellable, though the code is more complex than with the non-interruptible getByName. Test: VpnTest and in particular VpnTest#testStartRacoon Fixes the test meant to test this Also manual testing that resolution of a real hostname works as expected, that failure to resolve returns correctly, and that cancellation/interruption will unblock the thread and terminate immediately. Bug: 158974172 Change-Id: I90bec6d85706fa9b2f9a01f81701138a54347005 Merged-In: I96691f6091c43377f23a00621242ed034fcb0444 (cherry picked from commit 8ab570d9c9eb5e52b2c038818e3e4d1d3b98fda0)
2020-08-07Add a test for starting the legacy VPN.Chalard Jean
The legacy VPN has, among many parameters, a host to connect to. This host can be specified as a numeric address, or as a hostname. When it's a name, resolution is required. Currently, name resolution is performed by the native VPN daemons racoon and mtpd. When a hostname is used, the framework does not know the IP address of the VPN server and does not add a throw route for the VPN server IP address. On older kernels this does not matter because the legacy PPP kernel code binds the PPP socket to the right network, but on newer devices that use the upstream PPP code, this does not work. See b/133797637. This patch instruments the legacy VPN code so that it can be run in tests, and uses this instrumentation to simulate passing a configuration that contains a host, and verifies that the arguments passed to the mptd and racoon daemons receive the expected server address, and that the expected throw route is correctly installed. It then adds two tests : one specifying the server as a numeric address, and one as a hostname. As the resolution is currently broken, the latter of these tests is added disabled, and the followup fix to the issue enables it. This test is basic and very targeted, but it's what we need right now. Also there are plans to remove this entire code path in S, so the test being ad-hoc is not much of a problem. Test: this Bug: 158974172 Change-Id: I96f4bbb9b109e3e5813d083bed1989d88fb156b8 Merged-In: I3c4a94181bd71df68121fa0f71669fa4fa588bdd (cherry picked from commit dece7f3f74cb67f2a046f3a2a9757b559abc2aac)
2020-08-07Snap for 6743825 from b82ba472f7d96f564432c53fd40241744582b915 to rvc-d1-releaseandroid-build-team Robot
Change-Id: Ibbc1ca3b450ac29a21b0305893f7845b38250900
2020-08-06Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-devTreeHugger Robot
2020-08-06Add updatable-media jarjar rules to framework-allSantiago Seifert
Prevents the robolectric shadows jar from including ExoPlayer symbols, which collide with app-bundled class files. Bug: 161753405 Test: Manually checked robolectric jar contents. Test: Built sargo-userdebug, flashed and tested on physical device. Change-Id: I3bdc9e0b22cd0dea40f5bad15b0e6c619d32faf6
2020-08-06[automerger skipped] Merge "Notify IORap without including packages for ↵Calin Juravle
secondary dex opt." into rvc-dev am: eddf0c94d2 -s ours am skip reason: Change-Id Iae4fc0b6fc73707ada8895b38c3ae3f772ac2cd0 with SHA-1 8e41a2debb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12280079 Change-Id: Ia64d23ca6ed8b45553963af97ce65e153ab7af87
2020-08-06Merge "Notify IORap without including packages for secondary dex opt." into ↵Calin Juravle
rvc-dev
2020-08-06Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I4efc1a23c45bbff500fe38afbbea32d7f0b172b9
2020-08-06Merge "Extend SUPL network request timeout for consecutive SUPL request" ↵Wayne Lin
into rvc-d1-dev
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 04:51:10 +0000