Commit Graph

16345 Commits

Author SHA1 Message Date
Wu Ahan
c1c41be8c7 Merge "End the trace section while the surface has destroyed" into sc-dev am: 790f33d571
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13981701

Change-Id: I5dc78441b9462c76821eb49c59e5529e4f01ee6c
2021-04-06 13:58:42 +00:00
Wu Ahan
790f33d571 Merge "End the trace section while the surface has destroyed" into sc-dev 2021-04-06 13:36:37 +00:00
Galia Peycheva
4e0eba72cf Merge "Fix stale background blur drawable in DecorView" into sc-dev am: adb4b12d77
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13930319

Change-Id: I26331490deb6cd3df92410ca1badcc326cc9ac84
2021-04-06 10:40:08 +00:00
Galia Peycheva
adb4b12d77 Merge "Fix stale background blur drawable in DecorView" into sc-dev 2021-04-06 10:27:46 +00:00
Ahan Wu
c35810dd64 End the trace section while the surface has destroyed
- Also invoke end method in surfaceDestroyed.
- Add debug logs

Bug: 183348579
Test: atest FrameworksCoreTests:InteractionJankMonitorTest
Test: atest FrameworksCoreTests:FrameTrackerTest
Test: Check the pftrace file
Change-Id: Ic3ab5212bd1d5a828ef6605814dafa4ecca3df0d
2021-04-05 22:47:49 -08:00
Janis Danisevskis
eb7f5a130c Merge "Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references" am: a8b1b1a2e6 am: 08945c21ef am: 66ead4fb0b am: 9ba0f37f8a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624872

Change-Id: I1d15cbe4c91b0121b51f3b33f07cf0d3e9d86b01
2021-04-03 02:16:34 +00:00
Janis Danisevskis
9ba0f37f8a Merge "Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references" am: a8b1b1a2e6 am: 08945c21ef am: 66ead4fb0b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624872

Change-Id: I08fcf329e59c309d9292edc846653b02e7a60f21
2021-04-03 02:02:03 +00:00
Janis Danisevskis
66ead4fb0b Merge "Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references" am: a8b1b1a2e6 am: 08945c21ef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624872

Change-Id: I9efb4419a7dac6e1bb7d99f31e7776759cea9491
2021-04-03 01:16:07 +00:00
Janis Danisevskis
a8b1b1a2e6 Merge "Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references" 2021-04-03 00:21:18 +00:00
Hans Boehm
c82bfb81cc Merge "Rename to isIndefiniteThreadSuspensionSafe" am: 0bf32e7e7b am: b7f0eacf8f am: d5301eb3bf am: 874b0a96e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662663

Change-Id: I15e4f04c46e468dde1c812f66ba1ab62c4253f5d
2021-04-02 19:00:14 +00:00
Hans Boehm
874b0a96e0 Merge "Rename to isIndefiniteThreadSuspensionSafe" am: 0bf32e7e7b am: b7f0eacf8f am: d5301eb3bf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662663

Change-Id: Id628c80d3afda76d8107048a356f5816706d9a48
2021-04-02 18:42:20 +00:00
Hans Boehm
d5301eb3bf Merge "Rename to isIndefiniteThreadSuspensionSafe" am: 0bf32e7e7b am: b7f0eacf8f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662663

Change-Id: Id06325d1294f14f65795488d3ebe00dc7ccd0f4c
2021-04-02 18:16:03 +00:00
Hans Boehm
0bf32e7e7b Merge "Rename to isIndefiniteThreadSuspensionSafe" 2021-04-02 17:29:53 +00:00
George Mount
fcc0e10ea2 Merge "Fix NPE in RecyclerView" into sc-dev am: e57091c6c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14069295

Change-Id: I3ad45c9c3e8807bdf87d44f1ccd44ad129a109a0
2021-04-02 16:28:48 +00:00
George Mount
e57091c6c3 Merge "Fix NPE in RecyclerView" into sc-dev 2021-04-02 16:20:06 +00:00
Janis Danisevskis
a6dcf091f5 Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references
Bug: 171305684
Test: CtsKeystoreTestCases
Change-Id: I337515dadc9e45b909bff058d4e13371b4fa843c
2021-04-01 17:06:41 -07:00
Dmitri Plotnikov
847754313b Merge "Add BatteryConsumer.getPowerModel() method" into sc-dev am: 6a725247e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14057262

Change-Id: I3f6f937a5ff55793bda7134a47d6bae214b8c3d0
2021-04-01 23:43:33 +00:00
George Mount
49bd07d665 Fix NPE in RecyclerView
Bug: 184256183

Prevents NullPointerException when there are no children in the
RecyclerView while a fling occurs.

Test: Ran share sheet
Change-Id: I6aa5a4622c8afa792ca5e3f4c8fffb9ec92128d9
2021-04-01 23:34:25 +00:00
Dmitri Plotnikov
6a725247e5 Merge "Add BatteryConsumer.getPowerModel() method" into sc-dev 2021-04-01 23:25:55 +00:00
Hans Boehm
6fbea7cbbd Rename to isIndefiniteThreadSuspensionSafe
Bug: 181707712
Test: Build and boot AOSP
Change-Id: I0d95578cf689223a75fcb132f092805d77b1805b
2021-04-01 14:10:31 -07:00
Alec Mouri
9a601a015a Merge "Revert "Temporarily additional stats into battery dumpsys"" into sc-dev am: d998c94c2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14057252

Change-Id: I4230d652081c703aff8c3c2aa5671418f394e96f
2021-04-01 20:55:23 +00:00
Alec Mouri
d998c94c2a Merge "Revert "Temporarily additional stats into battery dumpsys"" into sc-dev 2021-04-01 20:54:48 +00:00
Steven Moreland
52f5620763 Merge "IBatteryStats.aidl update path" am: 2a27671122 am: 0fd713954b am: 7c8edecd6d am: dfcb3c7908
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661234

Change-Id: Iaf4576cef59e8a95646b8f173d3fb4b0aa65fe4f
2021-04-01 20:34:37 +00:00
Steven Moreland
dfcb3c7908 Merge "IBatteryStats.aidl update path" am: 2a27671122 am: 0fd713954b am: 7c8edecd6d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661234

Change-Id: Ief137e0a515e75737148c474bbdfa2f89be10952
2021-04-01 20:19:40 +00:00
Steven Moreland
7c8edecd6d Merge "IBatteryStats.aidl update path" am: 2a27671122 am: 0fd713954b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661234

Change-Id: If052ba67117e377e1db06c1f2a19159593a73d2d
2021-04-01 19:31:07 +00:00
Steven Moreland
2a27671122 Merge "IBatteryStats.aidl update path" 2021-04-01 18:08:11 +00:00
Aaron Huang
5b1b6bf264 Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: e427565991 am: 40b438abcc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625861

Change-Id: Ideb5a5abbd074a8c905861e902977c442317fc02
2021-04-01 16:45:22 +00:00
Aaron Huang
e427565991 Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" 2021-04-01 15:59:39 +00:00
Galia Peycheva
da9e3c8e1b Fix stale background blur drawable in DecorView
The BackgroundBlurDrawable is linked to a specific ViewRootImpl.
When the view is detached and re-attached, the ViewRootImpl changes, so
we need to reinitialize the background blur drawable inside DecorView.

This CL properly handles onDetachedFromWindow in DecorView.

Bug: 177523043
Test: m && atest BlurAggregatorTest
Change-Id: I2e25a2f85bdf95c151fd01dc794a6bc4b16c03b1
2021-04-01 15:28:04 +02:00
Aaron Huang
42951ddb37 Move some constants from TrafficStatsConstants to NetworkStackConstants
Keep the constants are only used by framework in TrafficStatsConstants
and move the others to NetworkStackConstants which is in libs/net.

Bug: 182349970
Test: FrameworksNetTests
      NetworkStackTests
      TetheringTests
Change-Id: Ib667c115e5f1e01237d88b77bba753363da309cc
Merged-In: Ib667c115e5f1e01237d88b77bba753363da309cc
2021-04-01 05:10:03 +00:00
Dmitri Plotnikov
c13f44e0aa Add BatteryConsumer.getPowerModel() method
This method will be used for testing and visualization purposes.

Bug: 184207674
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsTests
Change-Id: Id28ba4cbb8f27774f36248678f93ec187bc022b3
2021-03-31 18:14:08 -07:00
Alec Mouri
6abe2f9bc1 Revert "Temporarily additional stats into battery dumpsys"
This reverts commit 39db76b534.

Reason for revert: Eng-prod no longer requires this patch

Bug: 169376495

Change-Id: I93be09f03745734d65190a5a39f79d90c0150652
2021-04-01 00:22:55 +00:00
Steven Moreland
de4e95ed68 IBatteryStats.aidl update path
header moved

Bug: 183654927
Test: N/A
Change-Id: I5a74323f14da8aec636b4dea6eb22eae528556be
2021-03-31 23:46:34 +00:00
Wilson Wu
92de463629 Merge "Make IInputMethodPrivilegedOperations to async (1/N)" into sc-dev am: 889e3d63bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13982587

Change-Id: I22ec69e750da947d529ffc69971966bf965413b6
2021-03-31 10:41:08 +00:00
Wilson Wu
889e3d63bb Merge "Make IInputMethodPrivilegedOperations to async (1/N)" into sc-dev 2021-03-31 10:17:25 +00:00
Ioannis Ilkos
fb2db1932f Merge "Per process DMA-BUF stats" into sc-dev am: 50d4ba03b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13988962

Change-Id: Iabb28779cd1a79c60fcf2f0c45b151a5ea0de148
2021-03-31 09:00:01 +00:00
Ioannis Ilkos
50d4ba03b5 Merge "Per process DMA-BUF stats" into sc-dev 2021-03-31 08:48:55 +00:00
Yohei Yukawa
5c0c433891 Merge "Avoid IME restart for configChanges" into sc-dev am: 12e4fde793
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13885361

Change-Id: I25e694142090ece30cb15cde33124e094e0cf944
2021-03-31 02:41:58 +00:00
Yohei Yukawa
12e4fde793 Merge "Avoid IME restart for configChanges" into sc-dev 2021-03-31 02:28:22 +00:00
Rob Carr
7f89042c95 Merge "Expose API for using SurfaceControl with ViewRootImpl" into sc-dev am: 2b434b28b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13842193

Change-Id: I991c351464b0b4fa27a68ee065b3057bd6ec3a01
2021-03-31 02:00:38 +00:00
Rob Carr
2b434b28b0 Merge "Expose API for using SurfaceControl with ViewRootImpl" into sc-dev 2021-03-31 01:35:49 +00:00
Ray Essick
6ccf5d7c47 Merge "No longer preload libsfplugin_ccodec in zygote" into sc-dev am: 2d2519e32d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14008903

Change-Id: I97fc60f5cbeadd2b688054c962e702f17fc14b34
2021-03-30 21:10:08 +00:00
Ray Essick
2d2519e32d Merge "No longer preload libsfplugin_ccodec in zygote" into sc-dev 2021-03-30 21:09:42 +00:00
Daniel Sandler
8af8f8d0f4 Merge "Add INVOCATION_TYPE_POWER_BUTTON_LONG_PRESS." into sc-dev am: ca0ac5e60d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13732010

Change-Id: I1a4245af72156c77280bc1a0139fa13803c9b8ef
2021-03-30 20:33:40 +00:00
Daniel Sandler
ca0ac5e60d Merge "Add INVOCATION_TYPE_POWER_BUTTON_LONG_PRESS." into sc-dev 2021-03-30 20:23:06 +00:00
Taran Singh
71ab752fc5 Avoid IME restart for configChanges
Handle onConfigurationChanged() in order to prevent restarting
InputMethodService everytime. We introduce a new API attribute
"configChanges" in InputMethod(attrs.xml) which when declared
by IME, will be responsible for handling mentioned
configuration changes.

This CL re-introduces [1] with fix: Use new Configuration instance for
IMS#mLastKnownConfig and also handle followup comments.

[1] Ib94fddadb0dae648cf73a4c1642e51edebd19f50

Note: this change has no impact for devices not using DisplayAreas.

Bug: 167948419
Test: atest InputMethodServiceTest
    Manually:
      1. Patch Ie91e7a8e06b80864ef9409031e8543858552d70d to use dual
         display area.
      2. Open applications with editors on both display areas.
      3. Attach a debug point for IMS#onConfigurationChanged().
      4. Make sure IMS#resetStateForNewConfiguration() is not called
         when IME moves between these two identical DisplayAreas
    Also verify that bug 182604598 don't happen.

Change-Id: I43b6b80cdb35410554412ee1d3b0917ee3198272
2021-03-30 20:03:55 +00:00
Treehugger Robot
cbbe436700 Merge "Notify CellLocation whenever ACTION_USER_SWITCHED" am: 2a5efce2d7 am: 4a73b5f3b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550658

Change-Id: I796876646ef59d15fb1d9f1bd8b751af4c0ec304
2021-03-30 19:47:51 +00:00
Treehugger Robot
2a5efce2d7 Merge "Notify CellLocation whenever ACTION_USER_SWITCHED" 2021-03-30 19:01:17 +00:00
Taesu Lee
9a218febc2 Notify CellLocation whenever ACTION_USER_SWITCHED
Notify device's cell location when ACTION_USER_SWITCHED even though no
changes.
And 1st arg of notifyCellLocationForSubscriber() shall be subId instead.

Bug: 177495399
Test: atest TelephonyRegistryTest

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Merged-In: I6761c4bb500da1748119f9917663dae0307ab437
Change-Id: I6761c4bb500da1748119f9917663dae0307ab437
2021-03-30 17:47:48 +00:00
Amit Mahajan
a681f374b7 Merge "Notify CellLocation whenever ACTION_USER_SWITCHED" into sc-dev am: 244c071737
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13891835

Change-Id: Ideca245d742325e14d936ca36ddb9716727561ae
2021-03-30 17:45:13 +00:00