Commit Graph

16271 Commits

Author SHA1 Message Date
Dmitri Plotnikov
cb4178b772 Merge "Fix NullPointerException in BatteryUsageStats" into sc-dev am: 8017f4ed5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14179252

Change-Id: I86d79adb20c4747763bcf6fc8158cd42088d5651
2021-04-14 19:15:18 +00:00
Julia Reynolds
9accf5eb9b Merge "Update the notif expand button so it can be shared" into sc-dev am: 706bd974d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14188012

Change-Id: I00c732e7120f0dda1c21a61a197cb916e67949b1
2021-04-14 19:15:02 +00:00
Dmitri Plotnikov
8017f4ed5e Merge "Fix NullPointerException in BatteryUsageStats" into sc-dev 2021-04-14 19:10:36 +00:00
Julia Reynolds
706bd974d1 Merge "Update the notif expand button so it can be shared" into sc-dev 2021-04-14 19:06:34 +00:00
Dmitri Plotnikov
9f96d34f54 Merge "Remove POWER_COMPONENT_USAGE and TIME_COMPONENT_USAGE" into sc-dev am: 864454912a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14078197

Change-Id: I2554208cde4f42d1e8c8732296e9d584d42679c4
2021-04-14 18:04:56 +00:00
Dmitri Plotnikov
864454912a Merge "Remove POWER_COMPONENT_USAGE and TIME_COMPONENT_USAGE" into sc-dev 2021-04-14 17:50:25 +00:00
Siim Sammul
8a04f3a9ba Merge "Push the latency histograms to statsd" into sc-dev 2021-04-14 17:20:19 +00:00
Yohei Yukawa
e3a4a27c7e Merge "Make removeImeSurfaceFromWindow to one-way" into sc-dev am: 3b99155905
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14174202

Change-Id: Id0cfa659bf4b1f05f65a301ea0c9d23370e3f5ed
2021-04-14 17:17:45 +00:00
Yohei Yukawa
3b99155905 Merge "Make removeImeSurfaceFromWindow to one-way" into sc-dev 2021-04-14 17:12:18 +00:00
Julia Reynolds
10f23c1e9b Update the notif expand button so it can be shared
.. with notification history

Test: manual
Bug: 184695652
Change-Id: Iaa61d2442539ee42ec776530b84bf98c76e038a9
2021-04-14 16:54:08 +00:00
Kholoud Mohamed
5257c36d29 Merge "Fix bug in LockSettingsService" into sc-dev am: 3dca1466a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14127225

Change-Id: I81754e02ff97d35a1d48acf5fcb9f40bb2a8e116
2021-04-14 14:22:56 +00:00
Kholoud Mohamed
3dca1466a0 Merge "Fix bug in LockSettingsService" into sc-dev 2021-04-14 13:54:38 +00:00
Jeff DeCew
3b0078c57e Merge "Clean up MessagingLayout notifications" into sc-dev am: 42cef834c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14106007

Change-Id: Idb03dffc18dfe460e3425a68b8037593745508e6
2021-04-14 13:32:49 +00:00
Jeff DeCew
42cef834c7 Merge "Clean up MessagingLayout notifications" into sc-dev 2021-04-14 12:47:24 +00:00
Tianjie Xu
50016559a3 Merge "Improve the error handling for armRebootEscrow" am: 246c14d6da am: cd4836d197 am: f3bde71026 am: 9bf277f905
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649651

Change-Id: I77608efd2e11b359da3687048285c8e7bfbb9169
2021-04-14 08:16:43 +00:00
Tianjie Xu
9bf277f905 Merge "Improve the error handling for armRebootEscrow" am: 246c14d6da am: cd4836d197 am: f3bde71026
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649651

Change-Id: Ie1a2e4e87e1dcda0b53044c0cb577b938455fdee
2021-04-14 07:17:25 +00:00
Tianjie Xu
f3bde71026 Merge "Improve the error handling for armRebootEscrow" am: 246c14d6da am: cd4836d197
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649651

Change-Id: I6aabf1250d67f6a79711e89fb05c68bf84849656
2021-04-14 06:32:31 +00:00
Tianjie Xu
246c14d6da Merge "Improve the error handling for armRebootEscrow" 2021-04-14 05:23:07 +00:00
Dmitri Plotnikov
153f2acfee Fix NullPointerException in BatteryUsageStats
Bug: 185287730
Test: Build and launch Settings on a crosshatch
Change-Id: Iccdd8a0f3839b98dbb5c09599f35ac15985daa4c
2021-04-13 22:14:05 -07:00
Wilson Wu
7ec569a5cd Make removeImeSurfaceFromWindow to one-way
We introduced IVoidResultCallback mechanism to
removeImeSurfaceFromWindow in CL[1] to simulate
two-way behavior before it become truly one-way.

InputMethodManagerService#removeImeSurfaceFromWindow()
simply post the task into its message queue hence we
should able to safely convert this method into one-way.

-. Remove IVoidResultCallback for this method
-. Rename it to removeImeSurfaceFromWindowAsync

[1]: Icb396ae5d74060af69c4ecb16723b2e37b9f2067

Bug: 179668859
Bug: 185277968
Test: Manual test with b/179668859 steps, and works fine
Test: atest CtsInputMethodTestCases
Change-Id: Id28698e263a23ec4a6e4f89438eba5d19bbbabbb
2021-04-14 13:04:32 +08:00
Dmitri Plotnikov
9e19e96ad0 Remove POWER_COMPONENT_USAGE and TIME_COMPONENT_USAGE
... and use specific power components, such as POWER_COMPONENT_SCREEN

Bug: 184397335
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsTests
Test: mp :BatteryStatsViewer && adb shell am start -n com.android.frameworks.core.batterystatsviewer/.BatteryStatsViewerActivity
Change-Id: I551b2d37d2da77e21e622961f5290b55fb24da61
2021-04-13 21:59:26 -07:00
Bill Yi
4167bf213c Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE
Merged-In: I735b41ed53ce7d374b5d36c4aee79f73d0334234
Merged-In: I9999bfe514fffa9f300643e74942db5ae556670a
Change-Id: If4b670a158e561d8feb03e12aef2d295c5109d43
2021-04-13 19:36:45 -07:00
Suprabh Shukla
1698c0705e Merge "Suspend dialog improvememts" into sc-dev am: 9da117df72
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14150368

Change-Id: Icda2d764a05d9ec22cf7622a731cd94040e559c0
2021-04-14 00:08:56 +00:00
Suprabh Shukla
9da117df72 Merge "Suspend dialog improvememts" into sc-dev 2021-04-13 23:57:38 +00:00
Dmitri Plotnikov
27ec6b50da Merge "Add BatteryConsumer.getCustomPowerComponentName() and getCustomPowerComponentCount()" into sc-dev am: 07bc3d6d95
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14145993

Change-Id: Ida3b1050ac168abaed05e7ff2859ec50ecb76fd8
2021-04-13 23:49:21 +00:00
Dmitri Plotnikov
07bc3d6d95 Merge "Add BatteryConsumer.getCustomPowerComponentName() and getCustomPowerComponentCount()" into sc-dev 2021-04-13 23:44:29 +00:00
TreeHugger Robot
b890d019fa Merge "ConfirmUserCreationActivity hide non-sys overlays" into sc-dev am: 311c3aea77
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14129558

Change-Id: I7a9eec2686b3a6da5fcaa89d684ada6f443dd682
2021-04-13 23:04:02 +00:00
TreeHugger Robot
311c3aea77 Merge "ConfirmUserCreationActivity hide non-sys overlays" into sc-dev 2021-04-13 22:56:38 +00:00
Mark Renouf
b9650d6d47 Merge "Do not inset scrollBounds by padding unless clipToPadding==true" into sc-dev am: eaefe1464f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14163128

Change-Id: Ifcd7a4a76df81f5c9025005a8301ac91a347d913
2021-04-13 21:31:47 +00:00
Mark Renouf
eaefe1464f Merge "Do not inset scrollBounds by padding unless clipToPadding==true" into sc-dev 2021-04-13 21:06:39 +00:00
Siim Sammul
50ddece0e9 Merge "Change BinderLatencyBuckets to use int[] instead of ArrayList to improve performance." into sc-dev 2021-04-13 19:27:49 +00:00
Dmitri Plotnikov
3885aa960b Add BatteryConsumer.getCustomPowerComponentName() and getCustomPowerComponentCount()
Bug: 184207674
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsTests
Change-Id: Ic41cf53e553a25caa8bb6c84c30e3ea2b7627281
2021-04-13 12:16:13 -07:00
Mark Renouf
5ba19c973a Do not inset scrollBounds by padding unless clipToPadding==true
The intent is to avoid attempting to capture areas of a scrollable
view which will never display content. This is only the case when
clipToPadding = true (which is the default).

Bug: 185153400
Test: atest ScrollCaptureViewSupportTest
Change-Id: I2d97ba480320c3e83c056c0f51d7b4ca51715bd6
2021-04-13 10:53:14 -04:00
Paul Hu
65bc303fa8 Merge "Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT" into sc-dev am: 036d189a8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14134967

Change-Id: Iaae05598a4d39e4706a5cbbaf2dbc7e6f85de35b
2021-04-13 02:17:42 +00:00
Suprabh Shukla
346118543b Suspend dialog improvememts
Finishing the suspend dialog when the package for which it was shown
gets unsuspended for any reason.

Also, attributing any interaction with this dialog to the suspending
package, as the system is showing the dialog on its behalf.

Test: Manual, from an unrooted shell:
adb shell pm suspend com.android.chrome
Tap to start chrome and wait for the dialog to appear. Then:
adb shell pm unsuspend com.android.chrome
The dialog should disappear. Further,
adb shell dumpsys usagestats
should show USER_INTERACTION for com.android.shell.

Bug: 169137795
Fixes: 180336589
Change-Id: I70b6f23e2994d8802335e35932ed09209754697c
2021-04-12 19:10:31 -07:00
Paul Hu
036d189a8d Merge "Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT" into sc-dev 2021-04-13 02:05:21 +00:00
Siim Sammul
1aa3fb5e4c Change BinderLatencyBuckets to use int[] instead of ArrayList to improve
performance.

Cherry pick from master with no changes

Test: unit test
Bug: 179999191
Change-Id: Id996b52b5cb69a85f9c6a932ea8d30336fcaf12a
Merged-In: Id996b52b5cb69a85f9c6a932ea8d30336fcaf12a
(cherry picked from commit 9d02e6101e)
2021-04-12 20:58:00 +00:00
Siim Sammul
100497084a Push the latency histograms to statsd
Cherry pick from master with no changes

Test: unit tests, verified atom logging with statsd_testdrive
Bug: 180584913

Change-Id: I0b8db72c0cb3b285177bbe402ce37639c468dbf3
Merged-In: I0b8db72c0cb3b285177bbe402ce37639c468dbf3
(cherry picked from commit a28ccaf373)
2021-04-12 18:57:13 +00:00
Siim Sammul
650d60ad01 Merge "Store the collected binder latency samples in buckets to form a histogram. Add the ability to generate histograms with varying bucket counts and sizes." into sc-dev 2021-04-12 18:49:27 +00:00
Roland Levillain
d07546a852 Merge "Fix typo in documentation of ZygoteCommandBuffer.nativeForkRepeatedly." am: 304329d202 am: 87744c8b58 am: 1e3aafb013 am: 9e2adae46b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673345

Change-Id: Ic1f6e01b966ad1f29982390b49556b588f549ac5
2021-04-12 18:03:16 +00:00
Roland Levillain
9e2adae46b Merge "Fix typo in documentation of ZygoteCommandBuffer.nativeForkRepeatedly." am: 304329d202 am: 87744c8b58 am: 1e3aafb013
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673345

Change-Id: I8ed55afb37e23af6c9190eed535b2f2ae1424890
2021-04-12 17:46:03 +00:00
Roland Levillain
1e3aafb013 Merge "Fix typo in documentation of ZygoteCommandBuffer.nativeForkRepeatedly." am: 304329d202 am: 87744c8b58
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673345

Change-Id: I09389f60afbcf40532e140ce42e27f8ef9576ff6
2021-04-12 17:00:40 +00:00
Roland Levillain
904ec85b61 Fix typo in documentation of ZygoteCommandBuffer.nativeForkRepeatedly.
Test: none (documentation change)
Change-Id: I3373f33b1d3a292f79129048733f7ecacb5c4907
2021-04-12 13:37:03 +00:00
Tianjie
6066898f42 Improve the error handling for armRebootEscrow
The change including the following items
1. Add error code for armRebootEscrow
2. Fail the armRebootEscrow for mismatching ror providers.
3. clear the escrow data for fatal armRebootEscrow
4. clear the RoR preparation state in recovery system for fatal
   armRebootEscrow

Bug: 183140900
Test: atest FrameworksServicesTests:RebootEscrowManagerTests;
      atest FrameworksServicesTests:RecoverySystemServiceTest;
      Change provider before reboot, reboot-and-apply failed;
Change-Id: I266ea6f2e1c77994d5cc8c2713106c527c4e0722
2021-04-09 13:18:18 -07:00
Jeff DeCew
36dc1778c6 Merge "Use ImageResolver for BigPictureStyle when using BigPicture" into sc-dev am: 7e70261733
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13990325

Change-Id: If64e99258f9507bf743458bded305ff24c1201d3
2021-04-09 14:37:25 +00:00
Jeff DeCew
7e70261733 Merge "Use ImageResolver for BigPictureStyle when using BigPicture" into sc-dev 2021-04-09 14:24:34 +00:00
Jeff DeCew
f82dcec612 Clean up MessagingLayout notifications
* Collapsed state now appears with the 'headerless' style used for all other collapsed notification templates (except conversations / calls which have their own style).
* Expanded state contnues to use the 'header' treatment of all our big states, but messaging faces will now appear in the left icon gutter, and text will always align with other styles.
* Image messages show up in the 'right icon' location when collapsed, but will not be moved to the 'left icon' when grouped.
* 1-1 conversations will highlight the other user's name as the title, in the collapsed state.

Fixes: 173204301
Test: post and inspect lots of messaging notifications
Change-Id: I5a56d11ea98be1a22caca0d85040ab3fc375216f
2021-04-09 10:14:13 -04:00
kholoud mohamed
fecd017a1d Fix bug in LockSettingsService
Params for passwordToHistoryHash were
passed in the wrong order.
Also removed an used method.

Bug: 183716601
Test: N/A
Change-Id: I370f30ba2ad8fa0eba311c5219b8185dccda8e5e
2021-04-09 11:12:15 +01:00
paulhu
016950a485 Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT
As API review feedback, rename Build#VERSION#FIRST_SDK_INT to
Build#VERSION#DEVICE_INITIAL_SDK_INT. As well as update all usage
in frameworks and tests.

Bug: 184735771
Test: m
Change-Id: I72660959cb4e638a8e80fcf2f4e96ea172969f44
2021-04-09 15:47:36 +08:00
Siim Sammul
00f18654d3 Store the collected binder latency samples in buckets to form a
histogram. Add the ability to generate histograms with varying bucket
counts and sizes.

Bug: 179999191
Test: unit tests

Change-Id: I58d3cbdd9ae43c8da121ec41d994b077e29bb371
Merged-In: I58d3cbdd9ae43c8da121ec41d994b077e29bb371
(cherry picked from commit dcd3dc69a1)
2021-04-09 05:34:37 +00:00