Commit Graph

15881 Commits

Author SHA1 Message Date
Ahan Wu
032d7a0b53 Always remove the observers in cancel to avoid object leakage
We didn't remove the observers if the cancel invocation came from end(),
this caused leakage of FrameTracker, so we always remove the observers
no matter where the cancel invocation comes from.

Bug: 181683700
Test: atest FrameworksCoreTests:InteractionJankMonitorTest
FrameworksCoreTests: FrameTrackerTest
Change-Id: Ia03ebc3b579257dd387eaa1be65b9d22e7b7bf91
2021-03-09 18:15:43 +00:00
Dmitri Plotnikov
32a183264b Merge "Add batteryTimeRemaining and chargeTimeRemaining to BatteryUsageStats" into sc-dev 2021-03-06 01:56:32 +00:00
Jeff Sharkey
bb107f0d53 Merge "Add per-file OWNERS for ChargeCalculators" am: e191d88136 am: 7526d5687c am: 77229abe61
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621724

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3cfbb9ce3f4257cc676d24bcd0cb71b07279e56b
2021-03-05 22:36:55 +00:00
Jeff Sharkey
77229abe61 Merge "Add per-file OWNERS for ChargeCalculators" am: e191d88136 am: 7526d5687c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621724

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8b1efe14f542d922614121c4f9b1ffd4f2a61a6
2021-03-05 22:11:10 +00:00
Dmitri Plotnikov
cf2929ffe9 Add batteryTimeRemaining and chargeTimeRemaining to BatteryUsageStats
Bug: 158137862
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryChargeCalculatorTest
Change-Id: I247a593de242a2864eef16b7c9ea956209f60cbe
2021-03-05 13:57:47 -08:00
Dmitri Plotnikov
266ce1a1f0 Add per-file OWNERS for ChargeCalculators
Test: N/A
Change-Id: I0fd382a25afafcfb9476d35897ec8295f0293053
2021-03-05 10:04:07 -08:00
TreeHugger Robot
485249abd1 Merge "Clean up dead code in NetInitiatedActivity" into rvc-qpr-dev am: 91568eb50e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13288128

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ebe7a1a4da45b4e238de50aa21691afffa30203
2021-03-05 17:18:59 +00:00
TreeHugger Robot
91568eb50e Merge "Clean up dead code in NetInitiatedActivity" into rvc-qpr-dev 2021-03-05 17:10:19 +00:00
James O'Leary
c4748fdab2 Merge "Fix crash when number of pixels < max colors" into sc-dev 2021-03-05 16:25:06 +00:00
Alexander Potapenko
493a8a1ad0 Merge changes from topic "kernel_bootreceiver" into sc-dev
* changes:
  BootReceiver: collect kernel memory corruptions from dmesg
  BootReceiver: move to services/core/java/com/android/server
2021-03-05 14:09:39 +00:00
SongFerng Wang
03297aacc6 Merge "Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType" am: b332627a15 am: 6035378f91
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia227678f0f38adc05bf6ea39eee0eea8ebfea582
2021-03-05 05:17:43 +00:00
Christian Wailes
02d6322bd2 Merge changes I04ac8fba,Ia0a8548f am: db6628bb7d am: a534c95087 am: 87287a5859
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615382

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief019f6e8ee38664c5319e1756ca2c72065cd1af
2021-03-05 05:15:59 +00:00
Christian Wailes
87287a5859 Merge changes I04ac8fba,Ia0a8548f am: db6628bb7d am: a534c95087
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615382

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06eb075d11b110ccbbd8dcaecb948e502d69f6bb
2021-03-05 05:10:07 +00:00
Wilson Wu
70c6ea463b Merge "Make IInputMethodPrivilegedOperations to oneway" into sc-dev 2021-03-05 03:54:16 +00:00
SongFerng Wang
b332627a15 Merge "Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType" 2021-03-05 01:59:53 +00:00
TreeHugger Robot
72e83e74a0 Merge "Separate buffer stuffing and jank" into sc-dev 2021-03-05 01:54:13 +00:00
Jorim Jaggi
c373f35107 Separate buffer stuffing and jank
Bug: 161781469
Test: Perfetto trace with CUJ
Change-Id: I8583342a50a1d54b7aede89aa81c98178269b357
2021-03-04 21:48:30 +00:00
Christian Wailes
db6628bb7d Merge changes I04ac8fba,Ia0a8548f
* changes:
  Autoformatter changes.
  Inclusivity cleanup of the Zygote.
2021-03-04 21:09:52 +00:00
SongFerngWang
e206456a16 Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType
- Add more reasons of allowed network type
  - ALLOWED_NETWORK_TYPES_REASON_USER
  - ALLOWED_NETWORK_TYPES_REASON_CARRIER
- Add @systemApi for below
  - ALLOWED_NETWORK_TYPES_REASON_USER
  - ALLOWED_NETWORK_TYPES_REASON_POWER
  - ALLOWED_NETWORK_TYPES_REASON_CARRIER
  - setAllowedNetworkTypesForReason API
  - getAllowedNetworkTypesForReason API
  - getAllowedNetworkTypesBitmask API
- Add Public for below
  - CARRIER_NR_AVAILABILITY_NONE
  - CARRIER_NR_AVAILABILITY_NSA
  - CARRIER_NR_AVAILABILITY_SA
  - KEY_CARRIER_NR_AVAILABILITY_INT
- @Deprecated API
  - setPreferredNetworkTypeBitmask
  - getPreferredNetworkTypeBitmask
  - setAllowedNetworkType
  - getAllowedNetworkType
- Add a new way to notify allowedNetworkType at PhoneStateListener
- Replace KEY_NR_ENABLED_BOOL with KEY_CARRIER_NR_AVAILABILITY_INT

Bug: 161434786
Test: atest TelephonyManagerTest#testSetAllowedNetworkTypesForReason
(PASS)
atest TelephonyManagerTest#\
testSetAllowedNetworkTypesForReason_moreReason
(PASS)
atest PhoneStateListenerTest#\
testOnAllowedNetworkTypesChangedByRegisterPhoneStateListener
(PASS)

Change-Id: I3d0c119a0c2a30c56b0c127ba6525f8992b4e9dd
Merged-In: I3d0c119a0c2a30c56b0c127ba6525f8992b4e9dd
2021-03-04 14:58:54 +08:00
Alex Mang
d77366e4f2 Merge "Propagate ContentCaptureManager allowlist update to activities" into sc-dev 2021-03-04 02:26:25 +00:00
Jeff DeCew
82336d7562 Merge "Change groups to use number in the expander." into sc-dev 2021-03-04 01:12:21 +00:00
Chris Wailes
a6f8803c85 Inclusivity cleanup of the Zygote.
Changed "whitelist" to "allowlist" in many Zygote files.

BYPASS_INCLUSIVE_LANGUAGE_REASON="compatability with vendor files"

Test: cts
Change-Id: Ia0a8548f2e254fc36a9dce7e50af8284ed0caa47
2021-03-03 14:23:32 -08:00
TreeHugger Robot
1ef54a4a36 Merge "Broadcast cancel event of a CUJ session" into sc-dev 2021-03-03 21:14:03 +00:00
Jeff DeCew
138403add7 Change groups to use number in the expander.
* Old codepath is maintained; switch with config_showNotificationGroupCountInExpander.
* Use the default expander colors for low priority header.
* Uses the correct color for the old group overflow.
* Fixes the header view to correctly accomodates growing expander.

Bug: 181048615
Test: manual, visual inspection of groups and notification types that use headers
Change-Id: Ia314a6028645016df39d3e948fdc4eb194ed9ff2
2021-03-03 16:04:45 -05:00
Jeff DeCew
82b5194584 Merge changes Ifbf07b27,Ic9cd89e8 into sc-dev
* changes:
  Notification color overhaul.
  Implement the new visual style of the expand button
2021-03-03 21:02:08 +00:00
Stanislav Zholnin
4f5072825d Merge "Add API support for permission access timeline." into sc-dev 2021-03-03 16:35:28 +00:00
James O'Leary
bbfe962fff Fix crash when number of pixels < max colors
If extraction is run on a set of pixels whose count is less than the
number of max colors, then colors.length < max colors, and accesses
to colors[index] inside the for loop throw an ArrayOutOfBoundsException.

Test: add widget to home screen, reduce size of widget to small area.
observe crash. `mp core services` with fix, observe that crash no longer
occurs. `mp core services` again without fix, verify crash occurs after
boot.
Fixes: 181130209

Change-Id: I60bf1ab39f7a69f2fb0745049fd46d2f0b53a12c
2021-03-03 10:46:16 -05:00
Ming-Shin Lu
02116c6a4f Merge "Restore the last IME visiblity of the app window when allowed" into sc-dev 2021-03-03 14:30:15 +00:00
Stanislav Zholnin
07e6855f8b Add API support for permission access timeline.
Test: in development
Bug: 176965672
Change-Id: Ib06452946fda2fcbd32ac6172ea4a43dabde7b67
2021-03-03 11:03:07 +00:00
Wilson Wu
aa14580429 Make IInputMethodPrivilegedOperations to oneway
Comply all methods to ResultCallback to keep current
behavior and convert IInputMethodPrivilegedOperations
to one-way.

Bug: 173340613
Test: atest CtsInputMethodTestCases
Change-Id: I7dd8a457dbc7412c103a9ffe8d3895f30204f252
2021-03-03 18:11:24 +08:00
Alexander Potapenko
9676344a7d BootReceiver: move to services/core/java/com/android/server
Per Jeff Sharkey's suggestion, move this file to another subtree to
allow using com.android.server.IoThread. No functional change.

Test: manual runs with KFENCE enabled
Bug: 172316664

Signed-off-by: Alexander Potapenko <glider@google.com>
Change-Id: I338283f17ba7c108d9bdd60b3e01d6bcbfc6b38a
2021-03-03 10:41:30 +01:00
Alex Buynytskyy
967b81014f Merge "Remove INCREMENTAL_VERSION and add version to INCREMENTAL feature." into sc-dev 2021-03-02 21:24:41 +00:00
Jeff DeCew
f437e2c61f Implement the new visual style of the expand button
Bug: 181048615
Test: visual and talkback testing of normal notifs, conversations, groups.
Change-Id: Ic9cd89e899a03010a523bee4f1ef72fbfbd8b43f
2021-03-02 16:10:00 -05:00
Abhijeet Kaur
b68c51d4c4 Merge "Removed unused mount mode constants" am: 14f35d5f2d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80d0c585e742f33ce90fac787f54b5c0903f070f
2021-03-02 20:59:46 +00:00
Remi NGUYEN VAN
0442bbca78 Merge "Move SocketUtils out of the connectivity module" am: 4eb9b18e02 am: b3bc93fbcf am: 1efb1bf4a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592273

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9de14464ebb9d43e7c4fdc683c23ddbbcc7ef269
2021-03-02 19:56:48 +00:00
Remi NGUYEN VAN
1efb1bf4a8 Merge "Move SocketUtils out of the connectivity module" am: 4eb9b18e02 am: b3bc93fbcf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592273

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb9911ad2933d76acbfc8b23463639ffc82bb58b
2021-03-02 19:52:44 +00:00
Remi NGUYEN VAN
b3bc93fbcf Merge "Move SocketUtils out of the connectivity module" am: 4eb9b18e02
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592273

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2d4b5574ba710eb50c438144e2b87f6c8954336
2021-03-02 19:48:26 +00:00
Alex Buynytskyy
78c789d33f Remove INCREMENTAL_VERSION and add version to INCREMENTAL feature.
This is addressing the API feedback.

Bug: 181015045
Fixes: 181015045
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest PackageManagerServiceTest ChecksumsTest
Change-Id: I3ea745a4f0f0a0d9ae90f0625dfce61a8649a76d
2021-03-02 10:26:20 -08:00
Abhijeet Kaur
14f35d5f2d Merge "Removed unused mount mode constants" 2021-03-02 16:37:30 +00:00
Abhijeet Kaur
d41a537ed0 Merge "Removed unused mount mode constants" into rvc-qpr-dev-plus-aosp 2021-03-02 13:54:01 +00:00
Ahan Wu
cf7d9aa500 Broadcast cancel event of a CUJ session
Broadcast cancel events of a CUJ session to who is interested
in it like metrics collector.

Bug: 171912046
Test: atest FrameworksCoreTests:InteractionJankMonitorTest FrameworksCoreTests:FrameTrackerTest
Change-Id: I7bbef1448a8430d79163cdf55f5fba8f1c23d603
2021-03-02 16:45:23 +08:00
Alex Mang
842dd79ec5 Propagate ContentCaptureManager allowlist update to activities
Ref Doc: go/propagate-ccm-allowlist

BYPASS_INCLUSIVE_LANGUAGE_REASON=logging existing function call name
Tested: manually on device
Bug: 177345035
Bug: 165025636

Change-Id: I46c41a1e3e8a91a08889f5505e5bc1510776e253
2021-03-01 22:26:02 -08:00
Galia Peycheva
fd98c576c7 Merge changes from topic "add-runtime-blur-disabling" into sc-dev
* changes:
  Create listener for dynamic blurEnabled changes
  Make WM.LP.blurBehindRadius a setter+getter
2021-03-02 04:45:06 +00:00
Galia Peycheva
6e842a730c Create listener for dynamic blurEnabled changes
This CL exposes an API to let apps know when the blur has been enabled
or disabled dynamically.

This could be due to battery saving mode turned on, tunnel mode being
used, minimal post processing requested, etc.

This adds a WindowManager.addCrossWindowBlurEnabledListener, which allows
apps to add/remove a listener for blur enabled state changes. The
listeners are registered in a CrossWindowBlurListeners, which receives
updates from WindowManagerService when blurEnabled changes.
CrossWindowBlurListeners only registers a remote listener if the client
initializes it. I.e. if the app is not interested in blurs, the
CrossWindowBlurListeners won't get initialized and won't register a
remote listener.

WindowManagerService holds a RemoteCallbackList, which holds listeners
for each client process and notifies them when there are updates. If any
of the listeners' process dies, the entry is removed from the list.

Bug: 177524486
Test: m
CTS-Coverage-Bug: 179990440
Change-Id: I3fe8f2d2008171d6b069e8ee6f3b47e5b5d60cfa
2021-03-01 22:23:22 +01:00
Galia Peycheva
7fe1a92c60 Make WM.LP.blurBehindRadius a setter+getter
Bug: 181014794
Test: m && atest BlurTests
CTS-Coverage-Bug: 179990440
Change-Id: I3d8ceddcf1219df8decbbb0bf9a6bbb9d41799fb
2021-03-01 22:23:21 +01:00
Evan Rosky
ee971e5648 Merge "Fix some bugs in input rotation" into sc-dev 2021-03-01 19:20:50 +00:00
Yohei Yukawa
b2e45a2dc6 Merge "Revert "Avoid IME restart for configChanges"" into sc-dev 2021-03-01 18:30:36 +00:00
Taran Singh
712fc24a34 Revert "Avoid IME restart for configChanges"
Revert "Add cts for InputMethodService configChanges"

Revert submission 13417792-b/167948419

Reason for revert: Causes bugs like b/181195100
Reverted Changes:
Iff88b768c:Avoid IME restart for configChanges
Ib7ce13340:Add cts for InputMethodService configChanges

Bug: 167948419
Fix: 181195100
Change-Id: I36bca545b09b4f870560964ec61fa6bb344fceaf
2021-03-01 18:28:10 +00:00
Ming-Shin Lu
e99a1b491d Restore the last IME visiblity of the app window when allowed
Since when bring an existing app task to foreground or quick switching
app task with gesture navigation will first see the task snapshot
during app transition,

If the task previously focused and shown IME, even the task may hide
IME when switching to the next task, As the goal of
go/ime-transition-improve-s mentioned, if the task is still focused by
editor, we should keep the original focused IME shown and keep
the input connection focused state when navigating back to the
original task.

Bug: 166736352
Test: atest CtsInputMethodTestcases
Test: manual by focusing app with an editor to show keyboard,
      switch the app task to the next with gesture nav and then
      switched back, expected the soft-keyboard is still shown.

Change-Id: I63b144bed6c37569d79fba1c2b63dd4f1074f0f6
2021-03-01 23:41:22 +08:00
Connor O'Brien
f35f453e93 Merge "Revert "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()""" am: a0bbd188e4 am: 9267c31a1c am: fad30e4c7b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1602665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47f3e39fa42b7eb377f829bd4c1e255cd0f676cb
2021-03-01 08:17:14 +00:00