Commit Graph

620945 Commits

Author SHA1 Message Date
John Reck
5cb290bf54 Add stretch plumbing
Bug: 179047472
Test: builds & boots

Change-Id: I30b5d6683160af598f98555f61af1cf5a7639bbe
2021-02-01 14:41:07 -05:00
Kevin Chyn
1ee0214118 Merge "Hide Udfps icon when shade is expanded" into sc-dev 2021-01-27 18:30:31 +00:00
Suprabh Shukla
bd4c2eab98 Merge "Move allow-while-idle throttling to quotas" into sc-dev 2021-01-27 18:15:04 +00:00
Kevin Chyn
d4c000581a Merge "Check pending queue for cancelAuthentication" into sc-dev 2021-01-27 18:10:43 +00:00
TreeHugger Robot
c78898c3ee Merge "Enable HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED by default" into sc-dev 2021-01-27 17:46:36 +00:00
Winson Chung
918e1e01c4 Merge "6/ Update pip to use shell main thread" into sc-dev 2021-01-27 17:42:49 +00:00
Ytai Ben-tsvi
3f08df9fe9 Merge "Better fix for race condition in SoundTriggerHw2Enforcer" into sc-dev 2021-01-27 17:09:23 +00:00
Treehugger Robot
c75ca1ac2f Merge "Watchdog: Rename properties to follow guidelines" am: 62bdf8c076 am: cb24b18b50 am: 16f762211e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560493

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b23932117ca15b2dbe52da0234ebd54e9853bef
2021-01-27 17:09:08 +00:00
Treehugger Robot
16f762211e Merge "Watchdog: Rename properties to follow guidelines" am: 62bdf8c076 am: cb24b18b50
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560493

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c21124ca258bcfc6f968a25fa27f408d4213970
2021-01-27 16:48:42 +00:00
Treehugger Robot
cb24b18b50 Merge "Watchdog: Rename properties to follow guidelines" am: 62bdf8c076
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560493

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50a67a9f9244e5d5f16b186a8f993baf8303c236
2021-01-27 16:11:18 +00:00
TreeHugger Robot
e363da1269 Merge "[CEC Configuration] Add 'tv_send_standby_on_sleep' option" into sc-dev 2021-01-27 16:09:39 +00:00
Treehugger Robot
62bdf8c076 Merge "Watchdog: Rename properties to follow guidelines" 2021-01-27 15:43:17 +00:00
Chris Li
62f17faa91 Merge "Default value for DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW" into sc-dev 2021-01-27 15:28:02 +00:00
Yan Han
35f82506ac Enable HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED by default
Test: Manual test on ADT-3

Bug: 174136270
Change-Id: Ibb48edaba5f19bdb9de5ce79e93896cb9b5fc6c8
2021-01-27 15:10:19 +00:00
Jeff DeCew
52b003326d Merge "Add 'Android Resources' team as OWNERS of classes in android.util" am: 6671f75e1d am: ce917a8f14 am: d64f05737b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542391

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40c11677140a9f4e7d9fe629e2606c978d22a610
2021-01-27 14:16:32 +00:00
Treehugger Robot
f5c35bcfa7 Merge "[FUI03] No-op refactoring of VpnInfo" am: f9dbe61693 am: b0989fd2d2 am: 046ebf41b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05e6b14fca44919610317831c147413b0a431224
2021-01-27 14:16:00 +00:00
Woody Lin
bc8d470970 Watchdog: Rename properties to follow guidelines
Bug: 141948707
Bug: 178498518
Change-Id: Iefbeae8da80308be148610dc87d20553a290f4c5
2021-01-27 21:57:53 +08:00
Jeff DeCew
d64f05737b Merge "Add 'Android Resources' team as OWNERS of classes in android.util" am: 6671f75e1d am: ce917a8f14
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542391

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic86ad6333992c464f544d679ff8b138e175c2643
2021-01-27 13:57:47 +00:00
Treehugger Robot
046ebf41b7 Merge "[FUI03] No-op refactoring of VpnInfo" am: f9dbe61693 am: b0989fd2d2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic947ae7aabd4e0095e94977dffb66c2f6b7b9e57
2021-01-27 13:57:34 +00:00
Jeff DeCew
ce917a8f14 Merge "Add 'Android Resources' team as OWNERS of classes in android.util" am: 6671f75e1d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542391

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8179b0b4136d9b7665a8fe270872b92dccac9231
2021-01-27 13:33:35 +00:00
Michal Olech
dc2e424cdd [CEC Configuration] Add 'tv_send_standby_on_sleep' option
This ports Settings.Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED to
HdmiCecConfig.

Bug: 166433775
Test: atest HdmiCecLocalDevicePlaybackTest HdmiCecLocalDeviceTvTest
Change-Id: I27fe562d7d15f7a049e41a060179bf0d2fafdf9c
2021-01-27 13:24:08 +00:00
Jeff DeCew
6671f75e1d Merge "Add 'Android Resources' team as OWNERS of classes in android.util" 2021-01-27 13:18:49 +00:00
Treehugger Robot
b0989fd2d2 Merge "[FUI03] No-op refactoring of VpnInfo" am: f9dbe61693
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae15ffcf1fbf31ab004a36eb662f39e4439146d0
2021-01-27 13:11:28 +00:00
Treehugger Robot
f9dbe61693 Merge "[FUI03] No-op refactoring of VpnInfo" 2021-01-27 11:47:34 +00:00
TreeHugger Robot
c8d8b7cd9c Merge "Clean up BLOCK_ACTIVITY_STARTS_AFTER_HOME_FLAG." into sc-dev 2021-01-27 11:29:59 +00:00
Alan Stokes
dfebe6bd9b Clean up BLOCK_ACTIVITY_STARTS_AFTER_HOME_FLAG.
This flag was only introduced to allow teamfood testing of the change
to use background activity launch blocking instead of delaying app
launches after app switching protection is engaged. The flag has been
on everywhere for 2 weeks (ag/176961146) without problems and is no
longer needed.

This CL went in three stages:

- Change getBalAppSwitchesProtectionEnabled() in
  ActivityTaskManagerService to always return true.

- Inline the function (and selected others) into call sites and then
  eliminate the resulting dead code - done as a serious of automatic
  refactorings to minimise the risk of human error.

- Delete unit tests for code that no longer exists.

Apart from deleting the use of the flag I believe this CL is a pure
refactoring with no new behavior changes.

The end result is we eliminate quite a lot of code - especially
PendingActivityLaunch and all uses of it.

Test: atest BackgroundActivityLauncherTest
Test: atest ActivityStarterTests (both of them)
Test: manual
Bug: 176961146
Bug: 159433730
Change-Id: I01625843f67b00e5901833cff99aec16c1287a0c
Merged-In: I01625843f67b00e5901833cff99aec16c1287a0c
Exempt-From-Owner-Approval: proto change approved on main branch
(cherry picked from commit 5897ecc699)
2021-01-27 11:29:32 +00:00
Howard Chen
f13458e321 Merge "Refine the DSU SD card support" am: da932b4a45 am: adf0f11de8 am: 3b3dd247cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540921

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d4e7dc87a3eb0c40e10c5affc49d3be95fa86e0
2021-01-27 10:07:27 +00:00
Howard Chen
3b3dd247cd Merge "Refine the DSU SD card support" am: da932b4a45 am: adf0f11de8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540921

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaff78c43d6bb00ce8e2130edab9f4537dd18ad31
2021-01-27 09:49:43 +00:00
Howard Chen
adf0f11de8 Merge "Refine the DSU SD card support" am: da932b4a45
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540921

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2fb1cea8aa1b83ee9218cfca9f88c02d3607ff4b
2021-01-27 09:14:43 +00:00
Kevin Chyn
612b2adf18 Merge "Use mock IBiometricsFingerprint for Fingerprint21Test" into sc-dev 2021-01-27 09:14:34 +00:00
Kevin Chyn
3850b098b1 Merge "Send enrollment signals to SystemUI" into sc-dev 2021-01-27 09:13:51 +00:00
Remi NGUYEN VAN
7e56827d84 Merge "Move connectivity-sources to frameworks/base" am: d9f9d4a5d5 am: 4fff0be65e am: b0247948ef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552065

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9ccdcbd727ab8573aadeb5b7c8a9eb0569acac4
2021-01-27 08:49:37 +00:00
Howard Chen
da932b4a45 Merge "Refine the DSU SD card support" 2021-01-27 08:40:34 +00:00
Ytai Ben-Tsvi
e867da399e Better fix for race condition in SoundTriggerHw2Enforcer
This reverts commit 139f7c2389.

That commit had a potential for a deadlock, since calls both to and
from the HAL are synchronized and because of the requirement that
events are not permitted after stop() has been called, the HAL implementation
must block stop() for any outstanding events, but those events might
be blocked during the callback.

This fix avoids the original issue addressed by that commit in a
different manner: it simply reversed the ordering of setting the model
state and invoking start(), so that if an event arrives before start()
returns, we would still consider it valid.

Fixes: 177795410
Test: Manual verification of STHAL operation.
      Sent patch to bug reporter to apply and test.
Change-Id: I5b08158eaed8e4bba9f77249b7d5e5b73c33a744
(cherry picked from commit 9efec8111b)
2021-01-27 08:39:37 +00:00
Remi NGUYEN VAN
b0247948ef Merge "Move connectivity-sources to frameworks/base" am: d9f9d4a5d5 am: 4fff0be65e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552065

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I086ea4d13012e89a9ab9c006107fc24cbcb33db9
2021-01-27 08:27:55 +00:00
Treehugger Robot
6f77754650 Merge "Keystore 2.0 SPI Small doc comment fixup." am: 37356f4149 am: 1d4d6f4caa am: 2461dcf65f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561316

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id91035ac8a2eb0e89f8aaa67027185a279ac3533
2021-01-27 08:05:43 +00:00
James Mattis
1096fbb736 Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7 am: 96ccce1940 am: 7329e83d2f am: b214f23e61
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79c5b8919396827d281fcd04dced649847e9a038
2021-01-27 08:05:27 +00:00
Chiachang Wang
686fa2e950 Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a am: 18896c83ed am: 14dfb0cfe7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547642

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67420def56b12c3008daaa001b8f09680439d940
2021-01-27 08:05:05 +00:00
Chiachang Wang
0df3d8876c Merge "Update jni to get int descriptor in native layer" am: 1bd8cd59a5 am: e1874186ba am: 54e430d69a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553967

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc0ac9def6a0a05658235b61f36ef8829906c341
2021-01-27 08:04:37 +00:00
Benedict Wong
b8a7476bb7 Merge "Prep VCN files for exposing APIs" am: f0aa57318d am: 278b748966 am: 78e931383c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554718

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f018bfe94e7e020bcf262dae70687ded56d222e
2021-01-27 08:04:08 +00:00
Treehugger Robot
947ce6df2e Merge changes I8fffd952,Ief6690bb am: b4203793bf am: d16fff5b00 am: 476343a40c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550435

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fee6969997c057f6ed972ea4dcfaa7500f8a213
2021-01-27 08:01:37 +00:00
Paul Hu
13dd95a977 Merge "Fix FrameworksNetIntegrationTests failure" am: 5d496eb9b3 am: d8d1d3e2b3 am: 8107226e38
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559105

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a8b00c2f1b2d809e0aa3aa9f5a5cee58480fccd
2021-01-27 08:01:10 +00:00
Paul Hu
982a6e0561 Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()"" am: 742ec924e8 am: 57084714d4 am: 3739eed0ce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02ff8df90f86e25c8845301e11f351407bee0178
2021-01-27 08:01:01 +00:00
Treehugger Robot
35fe58bb8e Merge "Keystore 2 SPI: Fix KeyStorePublicKey getEncoded()." am: 9e5385798e am: 050882545c am: a38be41f98
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559984

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2aa3d12fc66b123fbba7af6ede0b2a91e159be1d
2021-01-27 07:59:53 +00:00
Josh Gao
a01cecbde9 Merge "Thread.sleep takes milliseconds, not seconds." am: b79bd2867f am: 81830b2d5f am: 629791842e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560108

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie06960dc37d80daebce68bf51e58b1b4cb7c6c0f
2021-01-27 07:59:01 +00:00
Hall Liu
eeb227a688 Merge "Correct name of roaming RTT config" am: b6622aeeb6 am: a083efc121 am: bd4e78b072
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560151

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia49cf8be4d1efd8b63846c39f94cf68937c0c5d2
2021-01-27 07:58:42 +00:00
Treehugger Robot
ed907b9203 Merge "Add app hibernation service stubs" am: d7bac025fb am: d131f3737d am: 1438f59fb0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1544924

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I938d23eada77c80966b710a373de927adf72fae4
2021-01-27 07:56:38 +00:00
Treehugger Robot
4bcc91667c [automerger skipped] Merge "Add enforcement parameter to RequiresFeature" am: dd438b73cc am: 371eea87de am: 551931360b -s ours
am skip reason: Change-Id Ia4cc8be8fdccbdeeecee956e4ccf02bda6d91845 with SHA-1 5bfa4239c1 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iacedffbb6da07e13e992cb907bfffeb8606c0c4c
2021-01-27 07:56:25 +00:00
Treehugger Robot
1df1f3f180 Merge "Set OWNERS for core/java/android/app/VoiceInteractor" am: ad1dde5594 am: c0f1148dc6 am: f33a10bffd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557029

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7305b329380ef4b2a5e9406302fc40f000062a7f
2021-01-27 07:56:10 +00:00
Treehugger Robot
652aedd5b2 Merge "Add visibility for new location of permission apex." am: 3525be2175 am: e1c8e59876 am: ab95b3352a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560528

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia25202e2d5f9ea3beffdaaaf6620436804756a7a
2021-01-27 07:55:51 +00:00