Commit Graph

19383 Commits

Author SHA1 Message Date
Makoto Onuki
c920cb83cc Merge "Don't allow dangerous operations on shared handlers" 2022-06-16 14:39:38 +00:00
Shumao Hou
79c3779bb1 BatteryStatsImpl: Add parcel methods for DisplayBatteryStats.
DisplayBatteryStats didn't have parcel methods and the estimated
multidisplay screen power was always initialized from 0.
The estimated screen power of the app will become inaccurate
after rebooting.

Bug: 235321975
Test: manual test.
1. Unplug the device.
2. Use an app for a while and keep screen on.
3. Capture the first bug report.
4. Reboot the device.
5. Capture the second bug report.
The estimated screen power of the app shouldn't become lower after rebooting the device.

Author: Shumao Hou <shumao1129@gmail.com>
Change-Id: If74e285102a7350c17c2fc40a205b2031e82f5f4
2022-06-15 15:50:23 -07:00
Makoto Onuki
a15d36b097 Don't allow dangerous operations on shared handlers
Test: Boot, tree hugger
Fix: 235594693
Change-Id: I1c14bc2e4dd22623cecbd166ea20cd62f6a8d790
2022-06-15 17:34:19 +00:00
Tiger Huang
f95f1a7949 Merge "Don't force IME drawing system bar backgrounds" into tm-qpr-dev am: 42ff37a278 am: 5e41b1eb20
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18869506

Change-Id: I1c0ed1cfa1d36c43ee33e554ff0bb204465b3266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:29:37 +00:00
Tiger Huang
5e41b1eb20 Merge "Don't force IME drawing system bar backgrounds" into tm-qpr-dev am: 42ff37a278
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18869506

Change-Id: I8dc2e62fe2c1357f82bffdc9af2f6b17acf2e81d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:10:02 +00:00
Tiger Huang
42ff37a278 Merge "Don't force IME drawing system bar backgrounds" into tm-qpr-dev 2022-06-15 05:34:36 +00:00
Treehugger Robot
aaa865f8e2 Merge "statemachine migration from base to modules-utils" am: 51e6e8a0e1 am: 8cc1782ba5 am: 4ecafadd7b am: d712bd402b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1893671

Change-Id: Ic9b0e6524abda9fdda863baec05adbc53417b1e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 03:06:36 +00:00
Dmitri Plotnikov
d4e7604d04 Merge "Remove dependency of battery history on com.android.internal.os.BatteryStatsImpl" 2022-06-15 02:13:58 +00:00
Treehugger Robot
4ecafadd7b Merge "statemachine migration from base to modules-utils" am: 51e6e8a0e1 am: 8cc1782ba5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1893671

Change-Id: I5ba9d65a7223fbf9d1f371e672491f09b05c1940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:25:27 +00:00
Treehugger Robot
17eee2d966 Merge "Add runtime crash information to sysprops" am: 68f657619c am: 0a3e8a46af am: f510d4e024 am: c021af23d3 am: 75784f47a9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107991

Change-Id: Ib7066cfcf775a46006a21443c975d6ca295b3bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:25:24 +00:00
Treehugger Robot
75784f47a9 Merge "Add runtime crash information to sysprops" am: 68f657619c am: 0a3e8a46af am: f510d4e024 am: c021af23d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107991

Change-Id: I9f4516d963b2031551e69284c792c39547e5029f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:23:16 +00:00
Treehugger Robot
8cc1782ba5 Merge "statemachine migration from base to modules-utils" am: 51e6e8a0e1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1893671

Change-Id: Ica83696aafc34e98de5a8a90838bb4b6a92ac58c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 00:59:17 +00:00
Treehugger Robot
f510d4e024 Merge "Add runtime crash information to sysprops" am: 68f657619c am: 0a3e8a46af
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107991

Change-Id: Ib5c224cd8192d883977d001a56194f8f8584e9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 00:40:26 +00:00
Treehugger Robot
51e6e8a0e1 Merge "statemachine migration from base to modules-utils" 2022-06-14 23:52:11 +00:00
Treehugger Robot
0a3e8a46af Merge "Add runtime crash information to sysprops" am: 68f657619c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107991

Change-Id: Ia6e09648c74410ce5d14dd6b2032e59466034cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 22:58:00 +00:00
Treehugger Robot
68f657619c Merge "Add runtime crash information to sysprops" 2022-06-14 22:28:58 +00:00
William Escande
0a85c4b800 Merge "statemachine migration from base to modules-utils" into tm-mainline-prod am: 47e8097666
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799173

Change-Id: I797ea1afbe48f53bed5904759296a80f7e95f84c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:57:06 +00:00
Dmitri Plotnikov
4596e5fccf Remove dependency of battery history on com.android.internal.os.BatteryStatsImpl
Bug: 235635119
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsTests
Change-Id: I6b573f90591aa0e404e7963c004de4dc2ac2452b
2022-06-14 13:27:57 -07:00
TreeHugger Robot
79c36f4c94 Merge "Move IRemoteInputConnectionInvoker to android.inputmethodservice" 2022-06-14 04:08:00 +00:00
Yohei Yukawa
2fddead57d Move IRemoteInputConnectionInvoker to android.inputmethodservice
IRemoteInputConnectionInvoker is used only from RemoteInputConnection,
which is already placed under android.inputmethodservice as a
package-private class.  Let's also move IRemoteInputConnectionInvoker
to android.inputmethodservice as a package-private class to minimize
its visibility.

This is a mechanical refactoring, which should have no user/developer
observable behavior change.

Bug: 234882948
Test: presubmit
Change-Id: Ie946993aeedc31a67e3074dc591245f75143a9f1
2022-06-13 18:28:40 -07:00
Dmitri Plotnikov
530e6e3685 Merge "Fix battery history parceling concurrency" 2022-06-14 00:18:10 +00:00
Matt Casey
7df9f7568c Merge "Finish mini-resolver after user action." into tm-dev am: 831370bffb am: 68bdb03d0c am: 01ca540e02 am: f4075745d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18838611

Change-Id: I9ebfc3eeaf7b12071b18c5c3c7098052eb31c096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:15:07 +00:00
Matt Casey
f4075745d8 Merge "Finish mini-resolver after user action." into tm-dev am: 831370bffb am: 68bdb03d0c am: 01ca540e02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18838611

Change-Id: I2459cee0f1b9e37c9f4ae45fe681a5e3e50ebabd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 16:46:12 +00:00
Matt Casey
01ca540e02 Merge "Finish mini-resolver after user action." into tm-dev am: 831370bffb am: 68bdb03d0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18838611

Change-Id: I2c7712973096e672492f797d0b30249a26ef595c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 16:29:20 +00:00
Matt Casey
5f3b7d655f Merge "Finish mini-resolver after user action." into tm-dev am: 831370bffb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18838611

Change-Id: I51f844182e43db1ebe3c50a543ea04f499943fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 16:03:03 +00:00
Matt Casey
831370bffb Merge "Finish mini-resolver after user action." into tm-dev 2022-06-13 15:46:13 +00:00
Yohei Yukawa
3e56ef4e06 Merge "Move *InlineSuggestions* to com.android.internal.inputmethod" 2022-06-13 15:10:26 +00:00
Tiger Huang
ff4891638d Don't force IME drawing system bar backgrounds
If IME doesn't have FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS, DecorView won't
show the color views for providing background color of system bars.
DecorView will call Window#onDrawLegacyNavigationBarBackgroundChanged
when the flag is changed. This gives NavigationBarController a chance
to decide whether to draw the legacy navigation bar background for the
IME or not.

Bug: 201375975
Test: Show IME in combinations of
      a. floating mode or non-floating mode
      b. gesture navigation or 3-button navigation
      c. taskbar or navigation bar
      d. light theme or dark theme
      And see if there is anything unexpected
Change-Id: If7ac32e2b874c04a260d542cb6a7595288aae182
2022-06-13 12:24:57 +00:00
Yurii Zubrytskyi
6444ca0aca Merge changes from topic "Tiramisu-SDK-Finalization-revert-hack" into tm-dev am: 120aa88d0d am: 4226e4b4e4 am: aed3061fec am: bd1e5cd3c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18764290

Change-Id: I5d5e4e78b35071f90e6c8b5835d09f538d2adc31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-11 09:12:51 +00:00
Yurii Zubrytskyi
4c2b5c8470 Merge changes from topic "Tiramisu-SDK-Finalization-revert-hack" into tm-dev am: 120aa88d0d am: 801d350fff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18764290

Change-Id: Ia19898c436e9b168efebc363ec19e9d3f10084a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-11 08:38:11 +00:00
Yurii Zubrytskyi
bd1e5cd3c5 Merge changes from topic "Tiramisu-SDK-Finalization-revert-hack" into tm-dev am: 120aa88d0d am: 4226e4b4e4 am: aed3061fec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18764290

Change-Id: Id43f749910e7d327cd0370071fc77de63af9267c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-11 08:37:40 +00:00
Yurii Zubrytskyi
4226e4b4e4 Merge changes from topic "Tiramisu-SDK-Finalization-revert-hack" into tm-dev am: 120aa88d0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18764290

Change-Id: Ic040b07c1559829833a4998f5001b8f34267c9a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-11 08:19:12 +00:00
Yurii Zubrytskyi
120aa88d0d Merge changes from topic "Tiramisu-SDK-Finalization-revert-hack" into tm-dev
* changes:
  Catch parsing errors for pre-release platforms
  Revert "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE"
2022-06-11 05:42:37 +00:00
Yohei Yukawa
44cb802c03 Merge "Move IInputMethod to com.android.internal.inputmethod" 2022-06-11 02:14:08 +00:00
Yohei Yukawa
8332e4d111 Merge "Move IInputMethodSession to com.android.internal.inputmethod" 2022-06-11 01:43:43 +00:00
Dmitri Plotnikov
63a5ffd3c3 Fix battery history parceling concurrency
Bug: 235609126
Test: atest  --rerun-until-failure 20   FrameworksCoreTests:BatteryUsageStatsProviderTest
Test: atest  --rerun-until-failure 20   FrameworksCoreTests:BatteryStatsHistoryIteratorTest
Change-Id: If20e019baa6105f7e50e9bcb8f3d6e34e7247976
2022-06-10 17:11:57 -07:00
Yohei Yukawa
bd8375b35a Move *InlineSuggestions* to com.android.internal.inputmethod
This CL moves 4 files that match *InlineSuggestions* from

  com.android.internal.view

to

  com.android.internal.inputmethod

as they are basically used only by IME classes (and Autofill).

Hopefully this gives better code organization and maintainance.

This is a mechanical refactoring of internal details.  There should be
no user/developer observable behavior change in this CL.

Bug: 234882948
Test: presubmit
Change-Id: Iac696ae501953ab6a90d99112a62221454cd76e4
2022-06-10 11:35:05 -07:00
Yohei Yukawa
1508f37558 Move IInputMethod to com.android.internal.inputmethod
This CL Moves IInputMethod from

  com.android.internal.view

to

  com.android.internal.inputmethod

to be consistent with other IME-related internal files.

This is a mechanical refactoring of internal details.  There should be
no user/developer observable behavior change in this CL.

Bug: 234882948
Test: presubmit
Change-Id: I1a43c2ad1f932ecb9201b3958becb475fb2d718d
2022-06-10 11:34:30 -07:00
Matt Casey
5b015f84af Finish mini-resolver after user action.
Bug: 235440512
Test: Trigger mini resolver, press each button and press back and verify
      the resolver is gone.
Change-Id: Ib22f7f38b4c5f7143b5898dbc3c74e3c7a0450f3
2022-06-10 18:06:18 +00:00
Yohei Yukawa
fd1580e341 Move IInputMethodSession to com.android.internal.inputmethod
This CL Moves IInputMethodSession from com.android.internal.view to
com.android.internal.inputmethod to be consistent with other
IME-related files.

This CL also moves IInputSessionCallback to
com.android.internal.inputmethod with renaming it to
IInputMethodSessionCallback for consistency.

This is just a renaming CL of implementation details.  There should be
no user/developer observable behavior change in this CL.

Bug: 234882948
Test: presubmit
Change-Id: I87495cbd482dd55005ac8d948f57f32bb016c7d6
2022-06-10 10:51:07 -07:00
William Escande
47e8097666 Merge "statemachine migration from base to modules-utils" into tm-mainline-prod 2022-06-10 17:19:03 +00:00
Eric Biggers
3c5af93bff Merge changes I778b343a,I2af1e6ec
* changes:
  Use isFileEncrypted() instead of isFileEncryptedNativeOrEmulated()
  Use isFileEncrypted() instead of isFileEncryptedNativeOnly()
2022-06-10 16:42:12 +00:00
Daniel Sandler
6559e223d8 Merge "Android 1<3." into tm-dev am: 0f8269e68e am: 24650a74b5 am: 4e8afe4a98 am: c458354096
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18819106

Change-Id: Ieca2556e145adb74eb48545a37141617621e2c61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 02:51:54 +00:00
Daniel Sandler
c458354096 Merge "Android 1<3." into tm-dev am: 0f8269e68e am: 24650a74b5 am: 4e8afe4a98
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18819106

Change-Id: Ic42648bf3e85888b7a8680c5b66c221f68a0e26e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 02:33:53 +00:00
Daniel Sandler
4e8afe4a98 Merge "Android 1<3." into tm-dev am: 0f8269e68e am: 24650a74b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18819106

Change-Id: I857bbfe8bb337fae261354cf77efe9f892273fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 02:17:41 +00:00
Daniel Sandler
a95ab05e3a Merge "Android 1<3." into tm-dev am: 0f8269e68e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18819106

Change-Id: Id245d8b53ae63dc7e47f1812528513e42b390312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 01:43:24 +00:00
Daniel Sandler
0f8269e68e Merge "Android 1<3." into tm-dev 2022-06-10 01:19:44 +00:00
Eric Biggers
9a07664850 Use isFileEncrypted() instead of isFileEncryptedNativeOrEmulated()
Since emulated FBE is no longer supported,
isFileEncryptedNativeOrEmulated() is the same as the new method
isFileEncrypted().  Replace all occurrences of
isFileEncryptedNativeOrEmulated() in this repository with
isFileEncrypted().

Bug: 232458753
Change-Id: I778b343adc85e5e6a45023f588eac509e3d93dd2
2022-06-09 20:49:59 +00:00
Eric Biggers
295d555611 Use isFileEncrypted() instead of isFileEncryptedNativeOnly()
Since emulated FBE is no longer supported, isFileEncryptedNativeOnly()
is the same as the new method isFileEncrypted().  Replace all
occurrences of isFileEncryptedNativeOnly() in this repository with
isFileEncrypted().

Bug: 232458753
Change-Id: I2af1e6ecb2655bd8a1ab6caf9e63040845572f1e
2022-06-09 20:49:59 +00:00
Dan Sandler
2c57c9c164 Android 1<3.
Fixes: 216297617
Test: adb shell am start -n android/com.android.internal.app.PlatLogoActivity
      adjust clock to 13:00
      for a bonus, long press on the bubbles
Change-Id: I3d32d452c6dd7a7e69aad86a033aba09ae8625d5
2022-06-09 12:54:27 -04:00