Commit Graph

519022 Commits

Author SHA1 Message Date
Tyler Gunn
8ef5d0eb2c Merge "Add default constructor to NR cell classes" am: f12f3415d0 am: 503b23ed03
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1202369

Change-Id: I87b1c44c4fc42d114bbe1bd25b2f3b2475d6c3e2
2020-08-19 15:18:42 +00:00
jasonwshsu
8ea64c4b6a Update language to comply with Android's inclusive language guidance
1. Rename isClientInWhitelist to isClientInAllowlist

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 162536543
Test: Build & run
Merged-In: Ibbd97bf31915d59b5110cbcc8f2126f7a7221060
Merged-In: I915e09e4e64d5c268630cec2d0ef05ea0592fd6f
Change-Id: I499c4574464862f3a1dcea2c6d51813e23ba4b82
2020-08-19 23:14:41 +08:00
Tyler Gunn
503b23ed03 Merge "Add default constructor to NR cell classes" am: f12f3415d0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1202369

Change-Id: Ife774cd4a160bd884ed4634d484fb7f9fbbedf32
2020-08-19 15:08:26 +00:00
Tyler Gunn
f12f3415d0 Merge "Add default constructor to NR cell classes" 2020-08-19 14:54:39 +00:00
wilsonshih
48288a505d Correct the return value of applyAnimationLocked.
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
2020-08-19 14:49:55 +00:00
Tiger Huang
23c75281ef Update requested state after applying pending frames
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
2020-08-19 20:42:39 +08:00
Tiger Huang
3b3ddb3574 Dispatch insets to client if mState is changed am: f8175d1a5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406767

Change-Id: I28e6b34667d53eb49f8b167964625342f8c29520
2020-08-19 12:19:31 +00:00
Yo Chiang
591602bf26 Post a notification if reboot to DSU failed
Also call resetTaskAndStop() so the lingering Installation task is
cleaned up and failed states such as installation progress are cleared.

Bug: 165471299
Test: Install a failing DSU package and observe logcat
Test: Retry install DSU package and observe notification progress
Change-Id: I1ce55ea98256954bb06d46ca948cae6ca48d9679
2020-08-19 20:14:04 +08:00
junyulai
6afd939ba5 Skip RAT type listener registration if IMSI is not available
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)
2020-08-19 09:53:20 +00:00
Tiger Huang
f8175d1a5b Dispatch insets to client if mState is changed
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
2020-08-19 15:32:53 +08:00
Bowgo Tsai
7dc8bf4acf Add systrace tag for system property
Introduce a new systrace tag, TRACE_TAG_SYSPROP, for use with
system property.

Bug: 147275573
Test: build
Change-Id: Id78992d238a73257bb9b80bfaa6bbfeb16f477d8
Merged-In: Id78992d238a73257bb9b80bfaa6bbfeb16f477d8
(cherry picked from commit 98d0d4ba03)
2020-08-19 06:51:36 +00:00
Bowgo Tsai
34750c7c5a Add systrace tag for system property
Introduce a new systrace tag, TRACE_TAG_SYSPROP, for use with
system property.

Bug: 147275573
Test: build
Change-Id: Id78992d238a73257bb9b80bfaa6bbfeb16f477d8
Merged-In: Id78992d238a73257bb9b80bfaa6bbfeb16f477d8
(cherry picked from commit 98d0d4ba03)
2020-08-19 13:10:36 +08:00
Jason Hsu
8dc88a6a46 Merge "Update language to comply with Android's inclusive language guidance" into rvc-d1-dev-plus-aosp 2020-08-19 04:57:42 +00:00
TreeHugger Robot
5d8f13267b Merge "Rename driver build time manifest flag." into rvc-dev-plus-aosp am: f2502dcd60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12404439

Change-Id: I96b6bdef10b75b466fe3d654d44dc21e4399b06a
2020-08-19 04:36:18 +00:00
TreeHugger Robot
f2502dcd60 Merge "Rename driver build time manifest flag." into rvc-dev-plus-aosp 2020-08-19 04:27:47 +00:00
Peiyong Lin
b0ce703e9a Rename driver build time manifest flag.
The driver apk is an implication of updatable, hence the word updatable
is redundant.

Bug: b/164449016
Test: build
Change-Id: Ia9477ed9277e20540f79e94e7229dc3760025eb8
2020-08-18 19:25:15 -07:00
Jeff Chang
31fc73a707 [RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display
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 73d6c7926d)
2020-08-19 01:53:13 +00:00
Elliott Hughes
f71ae332f9 Merge "Remove unused #include." am: c235669ec2 am: 7d741780c9 am: db764300eb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402794

Change-Id: I7bad68a02583647b66875e9be80f82ad3b2622c3
2020-08-19 00:14:45 +00:00
Elliott Hughes
db764300eb Merge "Remove unused #include." am: c235669ec2 am: 7d741780c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402794

Change-Id: I200d242c3b73571f5b2ce5e4ee9289660066bc14
2020-08-19 00:06:39 +00:00
Elliott Hughes
7d741780c9 Merge "Remove unused #include." am: c235669ec2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402794

Change-Id: I87cc526237c75f419173382be53a656ffe95ef9b
2020-08-18 23:51:26 +00:00
Elliott Hughes
c235669ec2 Merge "Remove unused #include." 2020-08-18 23:35:24 +00:00
Meng Wang
1fc9d9db6a Merge "Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID" am: 5c8e5ca313 am: f5997ba830 am: aabfda3787
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392756

Change-Id: If68f0ae7e2ae31d8d098f7b43404a853089bf4cd
2020-08-18 20:10:24 +00:00
Meng Wang
aabfda3787 Merge "Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID" am: 5c8e5ca313 am: f5997ba830
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392756

Change-Id: Ibac117099202d1fd2589c828270e3f3b09577479
2020-08-18 20:00:40 +00:00
Meng Wang
f5997ba830 Merge "Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID" am: 5c8e5ca313
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392756

Change-Id: I71c283427686526817b94a549dd9ac861d38acbf
2020-08-18 19:49:21 +00:00
Meng Wang
5c8e5ca313 Merge "Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID" 2020-08-18 19:34:51 +00:00
jasonwshsu
bde40af6ca Update language to comply with Android's inclusive language guidance
1. Rename isClientInWhitelist to isClientInAllowlist

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 162536543
Test: Build & run
Change-Id: I915e09e4e64d5c268630cec2d0ef05ea0592fd6f
Merged-In: Ibbd97bf31915d59b5110cbcc8f2126f7a7221060
2020-08-18 18:11:47 +00:00
Anton Hansson
b7b9f4aff9 [automerger skipped] Merge "Compose the main stubs jars from module stubs" am: bb7674fad3 am: 0c90961dcd -s ours am: 8af7727a85 -s ours
am skip reason: Change-Id I255486112c03f237aa342cfb93f3b473a2f50470 with SHA-1 4f8e749775 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402651

Change-Id: I867536744dccb0fd6fa382057680f4147b59b368
2020-08-18 16:05:34 +00:00
Anton Hansson
8af7727a85 [automerger skipped] Merge "Compose the main stubs jars from module stubs" am: bb7674fad3 am: 0c90961dcd -s ours
am skip reason: Change-Id I255486112c03f237aa342cfb93f3b473a2f50470 with SHA-1 4f8e749775 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402651

Change-Id: Ib6d0555cc320f595086ba443578874eff923ad02
2020-08-18 15:51:04 +00:00
Anton Hansson
0c90961dcd Merge "Compose the main stubs jars from module stubs" am: bb7674fad3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402651

Change-Id: I5ec1b6f3f09fee1c0a771aac101a173a0c2ded86
2020-08-18 15:32:48 +00:00
Anton Hansson
4b57d15fa3 Merge "Re-apply "Add bp-based disting of android stubs"" into rvc-dev-plus-aosp am: b1db8662c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12400764

Change-Id: I758b02aa5970e70dd5a067e72f1c3cf9d4719692
2020-08-18 15:32:11 +00:00
Anton Hansson
bb7674fad3 Merge "Compose the main stubs jars from module stubs" 2020-08-18 15:18:07 +00:00
Anton Hansson
b1db8662c0 Merge "Re-apply "Add bp-based disting of android stubs"" into rvc-dev-plus-aosp 2020-08-18 15:16:56 +00:00
Anton Hansson
318d951bff Merge "Make framework-res dep in stubs explicit" am: f0031bf353 am: dffa4110c6 am: dcd62bcecf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399179

Change-Id: Id1023890a8fc69342f2dd072dcbc8f86b8125196
2020-08-18 12:37:42 +00:00
Anton Hansson
53cf0ba71f Re-apply "Add bp-based disting of android stubs"
The issue with missing resources has been fixed.

This reverts commit 9b0a74f0a3.

Bug: 161214753
Change-Id: I863e76f199f7e209dfc86a85320f394c2285e71a
Test: diff sdk artifacts before and after
2020-08-18 12:35:31 +00:00
Anton Hansson
dcd62bcecf Merge "Make framework-res dep in stubs explicit" am: f0031bf353 am: dffa4110c6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399179

Change-Id: I7975a93cbbf95a0b199348e2155eff51227f9db8
2020-08-18 12:21:53 +00:00
Anton Hansson
b5972dfa09 [automerger skipped] Merge "Tweak stubs for updatable media" am: 2c99ff0042 am: 2b86731b42 -s ours am: 69acf25884 -s ours
am skip reason: Change-Id I498823de7315f78121975d36d6dc7667a8245085 with SHA-1 12a07676ed is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402650

Change-Id: I30cadc0348b4c4f188e7dfb69811b7de3194abae
2020-08-18 12:16:23 +00:00
Anton Hansson
dffa4110c6 Merge "Make framework-res dep in stubs explicit" am: f0031bf353
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399179

Change-Id: Icad8a2244e01edd32dc1512e9b3f3aaacaf55d57
2020-08-18 12:12:21 +00:00
Anton Hansson
69acf25884 [automerger skipped] Merge "Tweak stubs for updatable media" am: 2c99ff0042 am: 2b86731b42 -s ours
am skip reason: Change-Id I498823de7315f78121975d36d6dc7667a8245085 with SHA-1 12a07676ed is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402650

Change-Id: Ie7af76ecec8f0e7d7504cf1215a13b7d55006dca
2020-08-18 12:04:31 +00:00
Anton Hansson
f0031bf353 Merge "Make framework-res dep in stubs explicit" 2020-08-18 11:58:57 +00:00
Anton Hansson
2b86731b42 Merge "Tweak stubs for updatable media" am: 2c99ff0042
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402650

Change-Id: I4076ae331cfc6b752857b139853ec1befebba06c
2020-08-18 11:55:17 +00:00
Anton Hansson
2c99ff0042 Merge "Tweak stubs for updatable media" 2020-08-18 11:40:30 +00:00
Mark Chien
431f4a3369 Merge "Add usesCleartextTraffic to Tethering" am: 2940cc724a am: 6e202d7b50 am: ed63b6c56d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402629

Change-Id: I7a70a8ea8cfe430755544b0b57660658477e7416
2020-08-18 09:43:15 +00:00
Mark Chien
ed63b6c56d Merge "Add usesCleartextTraffic to Tethering" am: 2940cc724a am: 6e202d7b50
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402629

Change-Id: If1ea472e2b7e715ab97851394dc8980ad269b7a1
2020-08-18 09:28:57 +00:00
Mark Chien
6e202d7b50 Merge "Add usesCleartextTraffic to Tethering" am: 2940cc724a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402629

Change-Id: Ia5d7695edf13ac4ae9544c648fa95068809f0ab1
2020-08-18 09:19:56 +00:00
Jakub Pawlowski
97d1d347f0 [automerger skipped] Merge "audio: add device definitions for BLE Audio" am: 42ac870219 am: 707c709cf4 -s ours am: 52ac971a94 -s ours
am skip reason: Change-Id I0a39ffc49c0e7e5b36975656a33a2dd2946b60b7 with SHA-1 d77752dbf2 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399178

Change-Id: I7cb73be72e9df2230edd85ec6749586df329d0a5
2020-08-18 09:07:12 +00:00
Mark Chien
2940cc724a Merge "Add usesCleartextTraffic to Tethering" 2020-08-18 09:04:59 +00:00
markchien
5e1ca2bfb3 Add usesCleartextTraffic to Tethering
usesCleartextTraffic needs to be true for the networkstack process so
that the NetworkStack module can use no-encrypted probes to detect
captive portals.

When loaded in the networkstack process, all packages in process must
set usesCleartextTraffic=true, otherwise there may be races causing
the flag not to be set for the process.

Bug: 161860610
Test: CtsTetheringTest, TetheringTests
Change-Id: Ife03ee0c7096ea242eb701b297a69b471e15b436
2020-08-18 09:00:58 +00:00
Jakub Pawlowski
52ac971a94 [automerger skipped] Merge "audio: add device definitions for BLE Audio" am: 42ac870219 am: 707c709cf4 -s ours
am skip reason: Change-Id I0a39ffc49c0e7e5b36975656a33a2dd2946b60b7 with SHA-1 d77752dbf2 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399178

Change-Id: I7f46b38a8290d14f83f2e0862fbd85136b35c9fc
2020-08-18 08:56:25 +00:00
Jakub Pawlowski
707c709cf4 Merge "audio: add device definitions for BLE Audio" am: 42ac870219
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399178

Change-Id: I800c0a5adb3738924c8714be4f32c4185a334b92
2020-08-18 08:48:51 +00:00
Jakub Pawlowski
42ac870219 Merge "audio: add device definitions for BLE Audio" 2020-08-18 08:34:36 +00:00