Commit Graph

613200 Commits

Author SHA1 Message Date
Gavin Corkery
25f5bf48bf Store mitigation call history before reboot
As part of the effort to better support failure mitigation across
reboots, track the mitigation calls across reboots by storing them
along with other salient parts of MonitoredPackage. These values
are relative to the current uptime of the system, so that they will
be accurate when the system uptime is reset at the next boot.

Also refactored code to allow for testing the reading and writing
of MonitoredPackage objects, and added tests for this.

Test: atest PackageWatchdogTest
Bug: 171951174
Change-Id: Ia96cf3892886d8d77193ffc278fa1eb584fecdd3
2020-12-03 21:02:38 +00:00
Chris Li
a0077ffa38 Merge "Add enforcement for unique displayarea id" 2020-12-03 20:24:22 +00:00
Nikita Dubrovsky
25080800a6 Merge "Update ContentInfo.partition to return a Pair instead of a Map" 2020-12-03 20:13:06 +00:00
TreeHugger Robot
0e07a01471 Merge "Allowlist permission START_FOREGROUND_SERVICES_FROM_BACKGROUND." 2020-12-03 20:12:02 +00:00
TreeHugger Robot
398ef53804 [automerger skipped] Merge "Update link for Permissions samples in Javadoc" into rvc-dev am: 82a1ff7a94 am: 4224da2b2b am: 12f1567f76 -s ours am: f7bf6a7b82 -s ours
am skip reason: Change-Id I71ab17b21b31ff6584facd023e4c4818b0ab1b55 with SHA-1 a9565b2cb0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13159866

Change-Id: I787505f68141188afadd22dfc165cb32ecafdd15
2020-12-03 20:02:35 +00:00
TreeHugger Robot
02916a333e Merge "Migrate frameworks/base/cmds/statsd to packages/modules/StatsD/bin" 2020-12-03 19:56:46 +00:00
Beverly Tai
752a045e5d Merge "Update AOD/LS clock" 2020-12-03 19:53:25 +00:00
TreeHugger Robot
f7bf6a7b82 [automerger skipped] Merge "Update link for Permissions samples in Javadoc" into rvc-dev am: 82a1ff7a94 am: 4224da2b2b am: 12f1567f76 -s ours
am skip reason: Change-Id I71ab17b21b31ff6584facd023e4c4818b0ab1b55 with SHA-1 eff0b0673c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13159866

Change-Id: Iebed136ac38787da2b116812cea3d881d5f22a69
2020-12-03 19:47:04 +00:00
Wesley.CW Wang
eeda14fbb2 Make AOD battery text field support BatteryDefender
- Reupload CL from ag/13090497 to fix the merge conflict
 - Add overheat flag into BatteryStatus
 - Update AOD battery indication to support new state when BatteryDefender is enable
 Screenshot: https://screenshot.googleplex.com/BYyUYS7VGtyG3i7.png

Bug: 173080412
Test: atest SystemUITests:com.android.systemui.statusbar.KeyguardIndicationControllerTest
Change-Id: I74f32136ba034d2dea19f71e1e7cecc022cd9fa9
2020-12-03 19:45:14 +00:00
TreeHugger Robot
2b1787f2f5 Merge "Check version before calling new API" 2020-12-03 19:42:15 +00:00
Zimuzo Ezeozue
c56b112f44 Merge "Whitelist DeviceConfig permissions for MediaProvider" 2020-12-03 19:38:48 +00:00
Kevin Chyn
10a7843d33 Merge "Add sensorId to biometric sensor proto dumpsys" 2020-12-03 19:20:29 +00:00
Kevin Chyn
8405d546ea Merge "Hide udfps overlay when enrollment completes" 2020-12-03 19:19:21 +00:00
Flavio Fiszman
95db66d97e Merge "Populate Persons data in ShortcutInfo." 2020-12-03 18:47:29 +00:00
Chris Li
a74fdf285d Merge "Add tests for Dual DisplayAreaGroup device behaviors" 2020-12-03 18:44:43 +00:00
TreeHugger Robot
12f1567f76 Merge "Update link for Permissions samples in Javadoc" into rvc-dev am: 82a1ff7a94 am: 4224da2b2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13159866

Change-Id: I2dda484cb7780e15153442d29bc180045604aadb
2020-12-03 18:43:31 +00:00
TreeHugger Robot
6765ec3726 [automerger skipped] Merge "Update link for Permissions samples in Javadoc" into rvc-dev am: 82a1ff7a94 am: 64790b3d00 -s ours
am skip reason: Change-Id I71ab17b21b31ff6584facd023e4c4818b0ab1b55 with SHA-1 eff0b0673c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13159866

Change-Id: I53311922584e69b809cdfa452f4ecee023034ff5
2020-12-03 18:42:59 +00:00
TreeHugger Robot
631fafdf07 Merge "Do not allow non-system dialogs on UsbConfirmAct" into rvc-qpr-dev am: 2a3a3a1de8 am: c10f2b5e59
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13146867

Change-Id: I9ece6f9c247fe760d035b1b0d22704307bb9c7fe
2020-12-03 18:32:11 +00:00
TreeHugger Robot
e41f7f79bb [automerger skipped] Merge "Fix ConcurrentModification in onUidStateChanged" into rvc-qpr-dev am: 46f8c13e5b am: bc7b253887 -s ours
am skip reason: Change-Id Ib4c96e81cbe2adcfd53ea23ae644e978effb7a92 with SHA-1 aad5f733cd is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13144000

Change-Id: I2e1f034f26e6b188682d13e78d59802855255801
2020-12-03 18:32:00 +00:00
TreeHugger Robot
521227468a Merge "Update SystemUI and SettingsLib battery defender strings" into rvc-qpr-dev am: acccd0578a am: 08d924ebf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13137608

Change-Id: I7b7bfb60d49b4f8bb15c99ed12de5b677ccb01de
2020-12-03 18:31:25 +00:00
TreeHugger Robot
64790b3d00 Merge "Update link for Permissions samples in Javadoc" into rvc-dev am: 82a1ff7a94
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13159866

Change-Id: Idcd39a588593c6365899fd190dc4abab4ec6a81d
2020-12-03 18:22:57 +00:00
Tiger Huang
ba36870622 Merge "Use the bounds of WindowToken to compute window bounds" 2020-12-03 18:22:43 +00:00
TreeHugger Robot
4224da2b2b Merge "Update link for Permissions samples in Javadoc" into rvc-dev am: 82a1ff7a94
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13159866

Change-Id: I7a44807af073fbe861f2992bacfebd027d5af155
2020-12-03 18:22:30 +00:00
TreeHugger Robot
c10f2b5e59 Merge "Do not allow non-system dialogs on UsbConfirmAct" into rvc-qpr-dev am: 2a3a3a1de8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13146867

Change-Id: Ia0f3dcd128b4b53a23fd700aebb81ae7fe46919d
2020-12-03 18:11:35 +00:00
TreeHugger Robot
bc7b253887 Merge "Fix ConcurrentModification in onUidStateChanged" into rvc-qpr-dev am: 46f8c13e5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13144000

Change-Id: Iebf8e0aa1ddcbc8cb76cff97a6b2700cec2b76c7
2020-12-03 18:11:22 +00:00
TreeHugger Robot
08d924ebf0 Merge "Update SystemUI and SettingsLib battery defender strings" into rvc-qpr-dev am: acccd0578a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13137608

Change-Id: I12e42edfe8524d4f1ac1274b5e903e14f4bfcbac
2020-12-03 18:09:47 +00:00
TreeHugger Robot
82a1ff7a94 Merge "Update link for Permissions samples in Javadoc" into rvc-dev 2020-12-03 18:05:00 +00:00
TreeHugger Robot
2a3a3a1de8 Merge "Do not allow non-system dialogs on UsbConfirmAct" into rvc-qpr-dev 2020-12-03 18:00:20 +00:00
TreeHugger Robot
5e697c4ea6 Merge "Camera: Document behavior when cropRegion and zoomRation conflict" into rvc-qpr-dev am: cf91d4b9b9 am: a3b333b619
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13145508

Change-Id: I3d4b7164e45f375f97806769b4bcac879088d4db
2020-12-03 18:00:02 +00:00
TreeHugger Robot
3afa6ae787 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a4c9d532e0 -s ours am: 7c13fc86d1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13161917

Change-Id: I89ec5373e30ab57dd552498788d84b77c9d4ce1d
2020-12-03 17:59:37 +00:00
Bernardo Rufino
505fe3a5c7 Merge "Add BROADCAST_CLOSE_SYSTEM_DIALOGS to shell for tests" 2020-12-03 17:58:45 +00:00
Kweku Adams
b6a9683439 Merge "First version of HPJs." 2020-12-03 17:57:15 +00:00
TreeHugger Robot
46f8c13e5b Merge "Fix ConcurrentModification in onUidStateChanged" into rvc-qpr-dev 2020-12-03 17:53:33 +00:00
Nick Chalko
b333b38522 Merge "Fix metrics for set surface." 2020-12-03 17:50:37 +00:00
Nate Jiang
39f47e4e7b Check version before calling new API
DiscoverySession, onServiceLost is on available after Android 12. Add
version check.

Bug: 173554495
Test: atest android.net.wifi
Change-Id: I7bc77123ce817d3438982a25ae16b01a3727c8a1
2020-12-03 09:45:34 -08:00
TreeHugger Robot
acccd0578a Merge "Update SystemUI and SettingsLib battery defender strings" into rvc-qpr-dev 2020-12-03 17:41:16 +00:00
Nate Jiang
e741194612 Merge "[Suggestion] Add API to control carrier offload" 2020-12-03 17:38:04 +00:00
Nathalie Le Clair
d82cea9dc7 Merge "Fix logical address of DUT" 2020-12-03 17:23:42 +00:00
Nader Jawad
39cf120a8e Merge "Add support for drawLayer CanvasOps" 2020-12-03 17:12:37 +00:00
TreeHugger Robot
0d3d16b4d1 Merge "Rename send_standby_on_sleep in constants and methods" 2020-12-03 16:58:40 +00:00
TreeHugger Robot
a3b333b619 Merge "Camera: Document behavior when cropRegion and zoomRation conflict" into rvc-qpr-dev am: cf91d4b9b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13145508

Change-Id: Iacdbb68dfd551718cf513e887211c82297d8f651
2020-12-03 16:56:28 +00:00
TreeHugger Robot
7c13fc86d1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a4c9d532e0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13161917

Change-Id: I0ad27b48fcf45e04ad7d1d75a884a0285ccc9555
2020-12-03 16:55:17 +00:00
TreeHugger Robot
cf91d4b9b9 Merge "Camera: Document behavior when cropRegion and zoomRation conflict" into rvc-qpr-dev 2020-12-03 16:46:12 +00:00
Ioana Stefan
8e1c640feb Merge "Add extra methods to trigger IME tracing dumps" 2020-12-03 16:43:58 +00:00
Treehugger Robot
56bf02dddd [automerger skipped] Merge "Remove dependency on ModuleTestUtils" am: b8fca94cfe am: 161a88303b -s ours am: 1ee31f0ecb -s ours
am skip reason: Change-Id Ic311aeaf4801c3b7c0dc5cd7a222cc304bba1335 with SHA-1 ccf4849b52 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487756

Change-Id: I19884e0a1403c6fc30403b33f4ab024d7c9444a4
2020-12-03 16:42:23 +00:00
TreeHugger Robot
a4c9d532e0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-03 16:39:45 +00:00
TreeHugger Robot
9203d45c5b Merge "Measure and optimize IMF latency 6/n" 2020-12-03 16:38:38 +00:00
Beverly
caa8d7ffa0 Do not allow non-system dialogs on UsbConfirmAct
Test: manual
Bug: 173421110
Change-Id: Icc81a8bf4d85969756a002ee7880cc6c81ecd7a1
2020-12-03 16:27:57 +00:00
Treehugger Robot
1ee31f0ecb [automerger skipped] Merge "Remove dependency on ModuleTestUtils" am: b8fca94cfe am: 161a88303b -s ours
am skip reason: Change-Id Ic311aeaf4801c3b7c0dc5cd7a222cc304bba1335 with SHA-1 ccf4849b52 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487756

Change-Id: I32263fb3331823dc62491035b8e818fc9375b0f0
2020-12-03 16:04:41 +00:00
TreeHugger Robot
6f3ed806b6 Merge "DisplayImeController: fix out-of-sync IME visibility" 2020-12-03 15:40:40 +00:00