Issei Suzuki
54bfd5e650
Merge "Migrate WALLPAPER_LIGHT debug message to ProtoLog." into sc-v2-dev am: cd9c90750a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16004864
Change-Id: I4deaec1f298e177b90ce449ef10fd82b2c825a58
2021-10-12 15:25:14 +00:00
Issei Suzuki
cd9c90750a
Merge "Migrate WALLPAPER_LIGHT debug message to ProtoLog." into sc-v2-dev
2021-10-12 15:09:42 +00:00
Issei Suzuki
bde317e6b1
Migrate WALLPAPER_LIGHT debug message to ProtoLog.
...
Test: manual
Bug: 191438572
Bug: 202392340
Change-Id: Ibf538fce834715dc32741f4b52808f99020f741e
2021-10-12 09:38:58 +02:00
TreeHugger Robot
d3b973ce7e
Merge changes from topic "multiDisplayPowerProfile" into sc-v2-dev am: 71f8cf24e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15856347
Change-Id: I41f6ea048c6e1cd7a525be9db8c00dadee0d4709
2021-10-08 06:21:16 +00:00
Michael Wachenschwanz
8ac63071a4
Update PowerProfile to support multidisplay devices
...
Replaced the display related power constants with new ones that support
multidisply.
The legacy constants are marked as UnsupportedAppUsage, so they have not
been removed yet and they attempting to read them will return the power
constant values for the first display.
Fixes: 200226329
Test: atest com.android.internal.os.PowerProfileTest#testPowerProfile
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsTests
Change-Id: Id181443bd6f553ee37fc4a1647d31644fcad7912
2021-10-05 11:13:01 -07:00
TreeHugger Robot
e10d87b485
Merge "Add multi-user jank monitoring" into sc-v2-dev am: 89f022ac99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15891027
Change-Id: I8f5811c0f3d625c13422a9bcb050295bf7789368
2021-09-29 22:42:20 +00:00
TreeHugger Robot
89f022ac99
Merge "Add multi-user jank monitoring" into sc-v2-dev
2021-09-29 22:31:47 +00:00
Lucas Dupin
71d3f5bb9e
Add multi-user jank monitoring
...
Created CUJ for monitoring jank when switching users, including guest
users, but excluding the "Add User" user journey.
Bug: 200160966
Test: switch users manually, look at logs
Test: atest KeyguardUpdateMonitorTest
Test: atest UserSwitcherControllerTest
Change-Id: I5570133a1f96a58d39a8f053f9f480cdaada8df1
2021-09-29 10:26:26 -07:00
TreeHugger Robot
dad2a6fd9f
Merge "Zero out WiFi duration and power if ControllerActivityCounter is null" into sc-qpr1-dev am: c410f29893 am: bfe149f2ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934611
Change-Id: I19fdba5bffb025cb61f4de03fe8cf78c3b7c479b
2021-09-29 00:54:20 +00:00
TreeHugger Robot
bfe149f2ed
Merge "Zero out WiFi duration and power if ControllerActivityCounter is null" into sc-qpr1-dev am: c410f29893
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934611
Change-Id: Iee9dbf00b4568400c319a348587018bfa3e6fb77
2021-09-29 00:43:25 +00:00
TreeHugger Robot
7f541b72f7
Merge "Zero out WiFi duration and power if ControllerActivityCounter is null" into sc-qpr1-dev am: c410f29893
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934611
Change-Id: I94e7ba1c4e69ed2140ca49f4542c08e0bbd72573
2021-09-29 00:43:17 +00:00
TreeHugger Robot
347557e905
Merge "[NGA v2] Reliable Visible Activity Lookup" into sc-v2-dev am: 80fcbc8fe0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15810445
Change-Id: Ibfce3c573e7cc136226599500e438527a1565075
2021-09-28 18:02:38 +00:00
Dmitri Plotnikov
fb10be47c9
Zero out WiFi duration and power if ControllerActivityCounter is null
...
Bug: 200346841
Test: atest FrameworksCoreTests:WifiPowerCalculatorTest
Change-Id: I087e3b60c277c1d1a63b6c06e60ffcbe95224668
(cherry picked from commit 199f93ac3b )
2021-09-28 17:20:34 +00:00
lpeter
918ea9940f
[NGA v2] Reliable Visible Activity Lookup
...
To enable more voice-oriented in-app user journeys, Google Assistant
needs to access more information regarding the visible activities
via the Voice Interaction Session. Thus, we provide the APIs to receive
the changed visible activities in Voice Interaction Session.
Bug: 178244510
Test: atest CtsVoiceInteractionTestCases
Test: atest CtsVoiceInteractionTestCases --instant
Change-Id: I019d09fee8105ae1eadbc76803f46fd8b1948f6b
2021-09-28 17:06:49 +08:00
Varun Shah
991929b9fb
Merge "Dismiss the suspend dialog if conditions have been modified." into sc-qpr1-dev am: 912d89451a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15853562
Change-Id: Id9539465fac375a4c2953aff19d6b3e5a880375a
2021-09-27 16:10:57 +00:00
TreeHugger Robot
a401999f85
Merge "Check custom component names before aggregating BatteryUsageStats snapshots" into sc-qpr1-dev am: 0ef5152b17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15872124
Change-Id: I453c8cda7d7d6ab29facc35acd1d6ab84f6ee5fa
2021-09-25 02:17:20 +00:00
Dmitri Plotnikov
5375fe32cb
Drop per-app measured energy when an OTA changes the set of energy components am: 50348e3120
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15857253
Change-Id: Ib7813a74c1c4c12d1827d8a07f6caaa8dd4de65b
2021-09-25 02:11:05 +00:00
Varun Shah
153651ed3e
Merge "Dismiss the suspend dialog if conditions have been modified." into sc-qpr1-dev am: 912d89451a am: 12c61b00c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15853562
Change-Id: Iff94defece97ede092c6236da4833b7b3907e955
2021-09-24 18:20:29 +00:00
Varun Shah
12c61b00c0
Merge "Dismiss the suspend dialog if conditions have been modified." into sc-qpr1-dev am: 912d89451a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15853562
Change-Id: Ieead99da9e0ed20b30b9add94c8003ae69ef9424
2021-09-24 18:07:21 +00:00
Varun Shah
912d89451a
Merge "Dismiss the suspend dialog if conditions have been modified." into sc-qpr1-dev
2021-09-24 17:54:45 +00:00
TreeHugger Robot
d50fbe5665
Merge "Check custom component names before aggregating BatteryUsageStats snapshots" into sc-qpr1-dev am: 0ef5152b17 am: 4ff921f559
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15872124
Change-Id: If46ae1934feff590ce5202a25765f5eac9bfea41
2021-09-20 20:56:15 +00:00
TreeHugger Robot
4ff921f559
Merge "Check custom component names before aggregating BatteryUsageStats snapshots" into sc-qpr1-dev am: 0ef5152b17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15872124
Change-Id: Ib40da10e9db2ee290e1c65681e25862b0c6b7e35
2021-09-20 20:51:11 +00:00
Dmitri Plotnikov
0c561475c3
Check custom component names before aggregating BatteryUsageStats snapshots
...
If the lists of custom power components do not match, a crash will occur.
Instead of causing a crash, simply skip incompatible snapshots.
Bug: 196040329
Bug: 200511361
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryUsageStatsProviderTest
Change-Id: I87ba605371a5f3119dcff33f6109e94ee46ab57d
(cherry picked from commit a1ea9ecd56 )
2021-09-20 18:35:09 +00:00
Dmitri Plotnikov
c423ecc6c8
Drop per-app measured energy when an OTA changes the set of energy components am: 50348e3120 am: e4cc934175
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15857253
Change-Id: I8a243b171449a5e297ff9fffe844e873f90a76f3
2021-09-18 04:07:22 +00:00
Dmitri Plotnikov
e4cc934175
Drop per-app measured energy when an OTA changes the set of energy components am: 50348e3120
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15857253
Change-Id: I509be3ae6643864524529c06a61229c11b0ae008
2021-09-18 03:53:48 +00:00
Dmitri Plotnikov
50348e3120
Drop per-app measured energy when an OTA changes the set of energy components
...
Bug: 200123115
Test: atest BatteryStatsTests
Change-Id: I750a5c9fa3faa9757625b2d2494df1484b68016d
(cherry picked from commit 9cb960304e )
2021-09-17 23:10:56 +00:00
Varun Shah
777d87f91b
Dismiss the suspend dialog if conditions have been modified.
...
Whenever suspension conditions change, if there is a user-visible
suspension-related dialog, dismiss it to ensure the user is never
looking at stale information.
Bug: 169137795
Test: atest SuspendPackagesBroadcastTest#sendPackagesSuspendModifiedForUser
Test: manual (steps below)
-enable EBS, tap on suspended app to see dialog
-enable Focus mode, ensure dialog is dismissed
-tap on suspended app again to see relevent dialog,
disable Focus mode, ensure dialog is dismissed
-tap on suspended app again to see relevant dialog,
disable EBS, ensure dialog is dismissed correctly
-can permute enable/disable steps to further verify
Change-Id: Ib1650f910f7441498424ab4bc92185ce432ac405
(cherry picked from commit 25e73a8b9e )
2021-09-17 22:35:26 +00:00
Bernardo Rufino
2e3c6e5724
Merge "Remove sendCloseSystemDialogs() from PhoneFallbackEventHandler" into sc-qpr1-dev am: d9ba2df119 am: 5a2619c678
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15836011
Change-Id: I0665dc366b5dd14ddacc61ad882770f36ff79456
2021-09-17 15:43:59 +00:00
Bernardo Rufino
5a2619c678
Merge "Remove sendCloseSystemDialogs() from PhoneFallbackEventHandler" into sc-qpr1-dev am: d9ba2df119
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15836011
Change-Id: I9a03f509116603c2286b2c385af4587bd8dd9b09
2021-09-17 15:29:37 +00:00
Bernardo Rufino
00d9e5301e
Merge "Remove sendCloseSystemDialogs() from PhoneFallbackEventHandler" into sc-qpr1-dev am: d9ba2df119
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15836011
Change-Id: I92fe8e94c677f79951994d03c6cae6071f31592c
2021-09-17 15:29:36 +00:00
Bernardo Rufino
d9ba2df119
Merge "Remove sendCloseSystemDialogs() from PhoneFallbackEventHandler" into sc-qpr1-dev
2021-09-17 15:15:48 +00:00
Miranda Kephart
6f87f6c3e6
Merge "Fix direct share badges when sharing on work/personal profiles" into sc-qpr1-dev am: b51d58e6fd am: 0d5e670809
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15839049
Change-Id: Id5d2b3c70e7422e0040a927f3b778beb54bf297c
2021-09-16 14:14:04 +00:00
Miranda Kephart
082e54a5ba
Merge "Fix direct share badges when sharing on work/personal profiles" into sc-qpr1-dev am: b51d58e6fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15839049
Change-Id: I1ac8b7840f29eaa7353b4c744452d428271d6e12
2021-09-16 14:03:53 +00:00
Miranda Kephart
0d5e670809
Merge "Fix direct share badges when sharing on work/personal profiles" into sc-qpr1-dev am: b51d58e6fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15839049
Change-Id: I4ff949f7732fd4915b835e33a466165ab9d3c4f4
2021-09-16 14:03:52 +00:00
Miranda Kephart
63fe7d7343
Fix direct share badges when sharing on work/personal profiles
...
Use the passed-in user instead of the current user to determine
whether or not to add the work profile badge to direct share
target app icons, so that personal share targets do not have the
badge (even when sharing something from the work profile) and
work/managed share targets do have it (even when sharing something
from the personal profile).
Test: manual; tested appearance sharing from personal->work and
from work->personal
Bug: 197388251
Fix: 197388251
Change-Id: Ieee50d46e8058a92efa5be8aae9859447531c270
2021-09-15 15:20:14 -04:00
Bernardo Rufino
1538b7fda7
Remove sendCloseSystemDialogs() from PhoneFallbackEventHandler
...
Today's flow of events is like this: key goes to focused app
(ViewRootImpl::processKeyEvent), the view hierarchy does not handle the
event, so ViewRootImpl uses FallbackEventHandler to invoke the fallback
action for this key.
The problem is that for many keys the app itself is closing system
dialogs before taking the appropriate action (often launching an
activity, eg. dialer for KEYCODE_CALL), but this is now prohibited in S
due to abuse of said action.
The long-term plan is to return to InputDispatcher the fact that the key
wasn't handled by the app and have ID call out to the policy, which will
launch the appropriate action and adjust the UI as it sees fit (close
system dialogs).
However, we need to prevent apps from crashing because of this, hence
this change for S still. The unfortunate effect is that system dialogs
won't be hidden in these cases, but this livable with until we properly
implement the infrastructure.
Bug: 199173862
Test: Simulate code-paths with affected keys and make sure apps don't
crash:
1. adb shell input keyevent --longpress KEYCODE_CALL
2. adb shell input keyevent --longpress KEYCODE_CAMERA
Change-Id: I44ad41ac1eac9acc8320298ceb4c1b21bde8af5d
2021-09-15 15:25:47 +01:00
Wu Ahan
2feb569bed
Merge "Add latency instrument point for ACTION_TURN_ON_SCREEN" into sc-v2-dev am: d0b1d557e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15271990
Change-Id: I41abfb32db86fca9feb39f4b8b5439a6071ea6e2
2021-09-15 02:50:09 +00:00
Wu Ahan
d0b1d557e9
Merge "Add latency instrument point for ACTION_TURN_ON_SCREEN" into sc-v2-dev
2021-09-15 02:33:51 +00:00
Gaurav Bhola
3cd5455405
Merge "Move the NotificationAccessConfirmationActivity component name to resource config so that it can be overlayed." into sc-v2-dev am: 9260cf2831
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15634240
Change-Id: I8a97b36fb9e58ba97cab7c96dbe85ec02a969c05
2021-09-14 19:38:05 +00:00
Gaurav Bhola
9260cf2831
Merge "Move the NotificationAccessConfirmationActivity component name to resource config so that it can be overlayed." into sc-v2-dev
2021-09-14 19:25:04 +00:00
PETER LIANG
d60338ea9e
Merge "Fix the title of the HW "Edit shortcuts" menu is truncated when the device is folded." into sc-v2-dev am: d596ae37f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15746905
Change-Id: I2f993d298f539259506d499a242baa4a24ad487b
2021-09-14 04:08:58 +00:00
PETER LIANG
d596ae37f4
Merge "Fix the title of the HW "Edit shortcuts" menu is truncated when the device is folded." into sc-v2-dev
2021-09-14 03:58:38 +00:00
Ahan Wu
767bae370b
Add latency instrument point for ACTION_TURN_ON_SCREEN
...
We missed LatencyTracker.ACTION_TURN_ON_SCREEN, add proper instrument
point.
Bug: 188626939
Test: atest
Change-Id: If366a8bcbda41087dd1255110f4f60a8970cca15
2021-09-13 11:57:46 -08:00
Pavel Grafov
58ac1483e5
Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev am: a238881ee0 am: d730a09568
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15778512
Change-Id: I51b6f6f162ac83c7b7c8cdf75494319e4c6d8648
2021-09-13 14:18:44 +00:00
Pavel Grafov
a9a29b6ffe
Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev am: a238881ee0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15778512
Change-Id: I7dd1ea2b9c10a2410917fe89fb50ad8a17f2c3ea
2021-09-13 14:09:29 +00:00
Pavel Grafov
d730a09568
Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev am: a238881ee0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15778512
Change-Id: I44b1e9fa8d418ef84c1ab324306a00e47e5b4e9a
2021-09-13 14:08:56 +00:00
Pavel Grafov
a238881ee0
Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev
2021-09-13 13:52:26 +00:00
Dmitri Plotnikov
ac031c0c4d
Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 am: cc225325e3 am: e69a707085 am: 58214c18dd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145
Change-Id: I79141b6ae0be2d3aacc6a6168a9382940cfb3521
2021-09-10 19:25:01 +00:00
Dmitri Plotnikov
58214c18dd
Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 am: cc225325e3 am: e69a707085
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145
Change-Id: Iedc246526e371342096d6e3354b0e742bd4c855c
2021-09-10 18:56:26 +00:00
Dmitri Plotnikov
e69a707085
Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 am: cc225325e3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145
Change-Id: I531bd2c8da470bbde94135dfdddc425de5dbbf9c
2021-09-10 18:41:20 +00:00