Commit Graph

590467 Commits

Author SHA1 Message Date
TreeHugger Robot
2b0697c2ff Merge "AOD - Burn in adjustments" 2020-11-04 18:05:41 +00:00
Amy Zhang
e33b28101a Merge "Add onDvbcAnnexReported ScanCallback" 2020-11-04 17:51:17 +00:00
Anton Hansson
2ab8f9ffdd Merge "Restrict visibility of framework-module-common-defaults" am: 1de077e8fd am: 01091d8fe1 am: 2c4d7fcc1b am: 7de3848dc3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484099

Change-Id: I55e3033ed15bd840a229cea3b99969a197dffe34
2020-11-04 17:48:07 +00:00
Lyn Han
cef78df671 Merge "Add snooze button to notification guts" 2020-11-04 17:31:51 +00:00
Anton Hansson
7de3848dc3 Merge "Restrict visibility of framework-module-common-defaults" am: 1de077e8fd am: 01091d8fe1 am: 2c4d7fcc1b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484099

Change-Id: Iaab5e01fd17824ff977fd14f35c66262abf41d96
2020-11-04 17:13:16 +00:00
Anton Hansson
2c4d7fcc1b Merge "Restrict visibility of framework-module-common-defaults" am: 1de077e8fd am: 01091d8fe1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484099

Change-Id: I45816986c8f05d2d67b5623162b6ce6a6c178059
2020-11-04 17:02:59 +00:00
Anton Hansson
01091d8fe1 Merge "Restrict visibility of framework-module-common-defaults" am: 1de077e8fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484099

Change-Id: Ica7f1973bb843a64f471461208bae8e0ac69fae3
2020-11-04 16:40:33 +00:00
Songchun Fan
ff280720f6 Merge "[pm/incremental] disable unstartable state and hide related APIs" 2020-11-04 16:29:07 +00:00
Jorge Gil
293612d1a2 Merge "Move animation bounds into PipBoundsState" 2020-11-04 16:07:34 +00:00
Anton Hansson
1de077e8fd Merge "Restrict visibility of framework-module-common-defaults" 2020-11-04 15:49:55 +00:00
Antonella Dellanzo
494b090185 Merge "Updating launch tests" 2020-11-04 15:39:56 +00:00
Songchun Fan
2ea086d3f3 [pm/incremental] disable unstartable state and hide related APIs
Per discussions in go/incremental-when-to-freeze, we will not mark an
app unstartable, regarless of streaming health metrics.

This CL is a temporary disablement. The startable state will remain true,
and there will be no broadcasts about startability.

The event tracking and health monitoring is kept as is.

If we get feedback and need to put it back, it'll be a small change.
Otherwise, we will clean up the related code.

+ also fix storage health monitoring params

BUG: 171920377
Test: builds
Change-Id: Idf7d32d0ca3a6e08c9673914f27f22b531b91ac2
2020-11-04 15:36:27 +00:00
Mark Renouf
68ef6737fe Merge "Demo: show scroll chip and capture tall screenshot when tapped" 2020-11-04 14:51:23 +00:00
Matt Pietal
6a350b53cf AOD - Burn in adjustments
Move both the clock and keyguard slice area towards the middle for x
adjustments, and retain the current Y adjustments.

Bug: 172360102
Test: follow burn in instructions here:
/frameworks/base/packages/SystemUI/docs/clock-plugins.md

Change-Id: Id22d777724bf9be58758b1a2b260a7933af8e999
2020-11-04 09:12:50 -05:00
Dave Mankoff
f7019ee01b Merge changes from topic "b168904199-qs-injection"
* changes:
  2/N Remove last injection from QSCustomizer
  1/N Add QSCustomizerController
2020-11-04 14:09:39 +00:00
TreeHugger Robot
94b76b2267 Merge "Allow for multiple internal and external viewports." 2020-11-04 13:37:50 +00:00
vichang
bd61a3225e Merge "Add app compat config from ICU4J" am: 6d5fbc8434 am: cf0dc89869 am: 334b0811ac am: b295aad1bc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481306

Change-Id: Ie64209ccda762c3c7ebabdeace1a34c16794c47d
2020-11-04 13:34:08 +00:00
Eran Messeri
d81f5ef79b [automerger skipped] Merge "DO NOT MERGE: Introduce DPMS shim for active DO/PO check" am: 817969762e am: b0c59d4b6b am: b9ef876ca1 am: 275329ba8e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd15b5c294966297136e45d19c9ff238d47c2983
2020-11-04 13:33:46 +00:00
Eran Messeri
838709fe2d [automerger skipped] DO NOT MERGE: Introduce DPMS shim for active DO/PO check am: bdd52cb48b am: 9e6305e3b0 am: fcebc45fb0 am: 3b04027a04 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id6810e59354ad617785eeba7ca8600ea3778dc06
2020-11-04 13:33:42 +00:00
TreeHugger Robot
fbc5d0d259 Merge "Add new strings for Wi-Fi hotspot toggle specific scenario" 2020-11-04 13:29:42 +00:00
Julia Reynolds
0ef853937d Merge "Add some missing conversation log fields" 2020-11-04 13:14:47 +00:00
vichang
b295aad1bc Merge "Add app compat config from ICU4J" am: 6d5fbc8434 am: cf0dc89869 am: 334b0811ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481306

Change-Id: I99cb4aaebaca625078d148f074867f5e9d0a5b98
2020-11-04 13:00:39 +00:00
Eran Messeri
275329ba8e Merge "DO NOT MERGE: Introduce DPMS shim for active DO/PO check" am: 817969762e am: b0c59d4b6b am: b9ef876ca1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196

Change-Id: I8498b1d2eff4e149c87e2546615e3fc33ab3c76f
2020-11-04 13:00:22 +00:00
Eran Messeri
3b04027a04 DO NOT MERGE: Introduce DPMS shim for active DO/PO check am: bdd52cb48b am: 9e6305e3b0 am: fcebc45fb0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196

Change-Id: I76bfbffc3485cd07675ffc8c8c64f11a8a7d5d03
2020-11-04 13:00:13 +00:00
Mathew Inwood
e7b1832d7e Merge "De-restrict LoadedApk.getCompatibilityInfo()." 2020-11-04 13:00:00 +00:00
vichang
334b0811ac Merge "Add app compat config from ICU4J" am: 6d5fbc8434 am: cf0dc89869
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481306

Change-Id: Ifd0f4808d1467b3cf54b21982afc521769536a33
2020-11-04 12:46:56 +00:00
Eran Messeri
b9ef876ca1 Merge "DO NOT MERGE: Introduce DPMS shim for active DO/PO check" am: 817969762e am: b0c59d4b6b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196

Change-Id: I427bd9d552a512b6cc2280ac6dc773d355b74cad
2020-11-04 12:46:47 +00:00
Eran Messeri
fcebc45fb0 DO NOT MERGE: Introduce DPMS shim for active DO/PO check am: bdd52cb48b am: 9e6305e3b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196

Change-Id: I467120ce7e419a75749efac109609bb30cc35eff
2020-11-04 12:46:45 +00:00
vichang
cf0dc89869 Merge "Add app compat config from ICU4J" am: 6d5fbc8434
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481306

Change-Id: I155c8b08527e28efabef100c7105210b84ddbeec
2020-11-04 12:32:26 +00:00
vichang
6d5fbc8434 Merge "Add app compat config from ICU4J" 2020-11-04 12:28:57 +00:00
Eran Messeri
b0c59d4b6b Merge "DO NOT MERGE: Introduce DPMS shim for active DO/PO check" am: 817969762e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196

Change-Id: I01d19bd923e65dda0e939eb1a03102e505ce45f8
2020-11-04 12:28:00 +00:00
Antonella Dellanzo
4edf29c41e Merge "Add test to open app from overview" 2020-11-04 12:25:19 +00:00
Eran Messeri
9e6305e3b0 DO NOT MERGE: Introduce DPMS shim for active DO/PO check am: bdd52cb48b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196

Change-Id: I79e090d92c5bf17993f8e4f710581675eb72f2a9
2020-11-04 12:24:40 +00:00
Eran Messeri
817969762e Merge "DO NOT MERGE: Introduce DPMS shim for active DO/PO check" 2020-11-04 11:56:33 +00:00
TreeHugger Robot
135dc67cc9 Merge "Revert "Mark ACTION_REMOTE_BUGREPORT_DISPATCH broadcast as protected"" 2020-11-04 11:06:50 +00:00
Eran Messeri
bdd52cb48b DO NOT MERGE: Introduce DPMS shim for active DO/PO check
Introduce a shim into DevicePolicyManagerInternal &
DevicePolicyManagerService so that NetworkStatsAccessTest would not
diverge from internal development branches.

The DevicePolicyManagerService refactoring on the internal branch
removed isActiveAdminWithPolicy in favour of isActiveDeviceOwner and
isActiveProfileOwner.

These methods are being made available in AOSP for
NetworkStatsAccessTest.

Bug: 170459325
Test: atest NetworkStatsAccessTest
Change-Id: Ic7e0898989fb8222aaba2b35436765c04eb3250c
2020-11-04 10:07:06 +00:00
Allen Su
d5ca05c4f2 Merge "[IMS]Add bitrate and bandwidth into ImsStreamMediaProfile" am: 15075fcca0 am: e9fd3958f6 am: 3ce8089ecf am: 508f7d3f5b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478280

Change-Id: I00e639a177ec4f59ac659c8d23ffce86eb2594d4
2020-11-04 09:19:19 +00:00
Allen Su
508f7d3f5b Merge "[IMS]Add bitrate and bandwidth into ImsStreamMediaProfile" am: 15075fcca0 am: e9fd3958f6 am: 3ce8089ecf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478280

Change-Id: Icb4c73706da8322786c1884e2ca396bd8fd988e6
2020-11-04 08:56:46 +00:00
Mathew Inwood
1676c29c07 De-restrict LoadedApk.getCompatibilityInfo().
It is relied on by blaze mobile-install.

Bug: 172409979
Change-Id: Idefbd92fd4a2887f49b50455478b96435b6ce351
Fixes: 172083033
2020-11-04 08:52:14 +00:00
Allen Su
3ce8089ecf Merge "[IMS]Add bitrate and bandwidth into ImsStreamMediaProfile" am: 15075fcca0 am: e9fd3958f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478280

Change-Id: I22c3a132c4511d1907ff846d75073369711d97f3
2020-11-04 08:40:36 +00:00
Allen Su
e9fd3958f6 Merge "[IMS]Add bitrate and bandwidth into ImsStreamMediaProfile" am: 15075fcca0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478280

Change-Id: I02a791584a66c1d1571046c5ab026423e2d3aadc
2020-11-04 08:26:49 +00:00
Sergey Nikolaienkov
c0b6daaf6b Merge "Fix NPE when reference PipMenuActivityController on TV" 2020-11-04 08:13:51 +00:00
Allen Su
15075fcca0 Merge "[IMS]Add bitrate and bandwidth into ImsStreamMediaProfile" 2020-11-04 07:53:42 +00:00
Tony Huang
ae7e2fb0bb Merge "Migrate Bubbles to wm-shell (5/n)" 2020-11-04 07:31:30 +00:00
Wei Sheng Shih
355c78fcfd Merge "Allow Activity#setTurnScreenOn to wakeup device" 2020-11-04 06:39:30 +00:00
Jimmy Chen
e9c67a6886 Merge "wifi: create an option for the WPA3 Enterprise security type" 2020-11-04 06:28:39 +00:00
Automerger Merge Worker
f1bb3b457c Merge "[automerger skipped] Merge "Introduce INPUT_CONSUMER permission for InputConsumer" into rvc-d1-dev am: c3347f92cd -s ours am: f4a788bee3 -s ours" into rvc-qpr-dev-plus-aosp am: 7b8c2f0086 -s ours
am skip reason: Change-Id I7a4c2c4cba7ea670873ab2ac49b9880d9a65cd86 with SHA-1 48002d8936 is in history

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

Change-Id: I8ad056054a7e625bcaa02ecd99e58e91f10d6868
2020-11-04 06:12:29 +00:00
TreeHugger Robot
bfc10dab2e [automerger skipped] Merge "Introduce INPUT_CONSUMER permission for InputConsumer" into rvc-d1-dev am: c3347f92cd am: 82415c8b8b -s ours am: 434fbe192b -s ours
am skip reason: Change-Id I7a4c2c4cba7ea670873ab2ac49b9880d9a65cd86 with SHA-1 80951fa9a8 is in history

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

Change-Id: I29d3db4159cda258c5a9a8437382e4a402807b3b
2020-11-04 06:12:12 +00:00
TreeHugger Robot
35615f9bc3 Merge "Instrument CUJ for HUN and App launch from notification" 2020-11-04 06:00:04 +00:00
Winson Chung
f97bf81d1e Merge changes I581de3ff,I7d777c59
* changes:
  5/ Validate and resolve shortcut & task activity infos
  4/ Add basic drag and drop policy & handler for the shell
2020-11-04 05:57:22 +00:00