Treehugger Robot
30f8a371b7
Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."" am: dd8891acbe am: 4ac4916c8d am: cf7203f5d3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525189
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I024a2f38dfd2432ae77d6a032c27fc8389cf62dc
2020-12-12 01:07:05 +00:00
TreeHugger Robot
87960020f2
Merge "Added MANAGE_USERS to CarProvision."
2020-12-12 00:54:56 +00:00
Chinmay Dhodapkar
7a0f88ea00
Merge "Supported IWLAN Fail Cause" am: 32e1818fb1 am: bd1ec8809f am: 3ccb112354
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513195
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia4ba30c9f2fd56c2c537cec9a5ddb94d5406ef23
2020-12-12 00:53:01 +00:00
TreeHugger Robot
943cd34213
[automerger skipped] Merge "DO NOT MERGE Add RECORD_AUDIO_OUTPUT app op" into rvc-qpr-dev-plus-aosp am: 0ecf6b6d4e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210948
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4ba9c2943f09aebe32b3855cbffb96a9bd131727
2020-12-12 00:52:41 +00:00
Treehugger Robot
cf7203f5d3
Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."" am: dd8891acbe am: 4ac4916c8d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525189
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I063cb954f1833c45debf25cb0b072706eb55d2c4
2020-12-12 00:49:56 +00:00
Chinmay Dhodapkar
3ccb112354
Merge "Supported IWLAN Fail Cause" am: 32e1818fb1 am: bd1ec8809f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513195
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie6b027bff16ddec92581ed5fc0ed3b6b3073a24f
2020-12-12 00:49:06 +00:00
TreeHugger Robot
0ecf6b6d4e
Merge "DO NOT MERGE Add RECORD_AUDIO_OUTPUT app op" into rvc-qpr-dev-plus-aosp
2020-12-12 00:41:43 +00:00
Treehugger Robot
4ac4916c8d
Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."" am: dd8891acbe
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525189
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I48cb973018ef4f81b088232894c9ae087bd2d431
2020-12-12 00:26:10 +00:00
Andy Hung
605888324f
Merge "Midi: Use exceptionCode instead of transactionError"
2020-12-12 00:22:06 +00:00
Chinmay Dhodapkar
bd1ec8809f
Merge "Supported IWLAN Fail Cause" am: 32e1818fb1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513195
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8e2d1e1b669e2e27dc3449cfb7ee4b2fcb9715d7
2020-12-12 00:20:18 +00:00
Treehugger Robot
dd8891acbe
Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ...""
2020-12-12 00:14:21 +00:00
TreeHugger Robot
f202279b2d
Merge "Do not merge two consecutive text change content capture events if one of them clears the text"
2020-12-12 00:01:35 +00:00
Terry Wang
9976ea6865
Merge "Revert "Split getInstance and createInstance in AppSearchImpl""
2020-12-11 23:59:13 +00:00
TreeHugger Robot
71ff4e2978
Merge "Rename powerstatstests to batterystatstests"
2020-12-11 23:49:51 +00:00
Chinmay Dhodapkar
32e1818fb1
Merge "Supported IWLAN Fail Cause"
2020-12-11 23:32:54 +00:00
TreeHugger Robot
1923524096
Merge "Move permission methods in PackageManager to PermissionManager."
2020-12-11 23:24:05 +00:00
Vishnu Nair
31ec9ecb8d
Merge "Revert^3 Flip BLAST for SurfaceView""
2020-12-11 23:15:26 +00:00
Tyler Gunn
eccaab80dd
[automerger skipped] Grant CHANGE_DEVICE_IDLE_TEMP_WHITELIST to call log provider. am: 108dd94479 am: 3b22f9b76d -s ours
...
am skip reason: Change-Id I3e84d65292ec74ffe374fc997e57c4c688f71b9d with SHA-1 4fc34dc7c5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210145
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifb622fe87cfacc8058093c731e802a058c912c47
2020-12-11 23:14:32 +00:00
Cassie Wang
41fdd66dd8
Merge "Change AppSearch querier from component to package."
2020-12-11 23:03:39 +00:00
Tyler Gunn
3b22f9b76d
Grant CHANGE_DEVICE_IDLE_TEMP_WHITELIST to call log provider. am: 108dd94479
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210145
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I680ab455cf22878436d1843b6710bf05f3d90c96
2020-12-11 23:01:26 +00:00
Clemenz Portmann
f2f545d7a0
Merge "Change android.testPatternData --> android.control.testPatternData"
2020-12-11 22:18:29 +00:00
Terry Wang
07c2422ad0
Revert "Split getInstance and createInstance in AppSearchImpl"
...
This reverts commit 5caaa238eb .
Reason for revert: <b/175408530>
Change-Id: Icc000c874ff1db45eba1a513e8aacf52b4ede147
2020-12-11 22:17:09 +00:00
Chris Li
786d279f6c
Merge "Allow TaskDisplayArea to have TaskDisplayArea children (2/n)"
2020-12-11 22:00:44 +00:00
TreeHugger Robot
42fa75c72b
Merge "Don't open frontend device if it's a shared frontend"
2020-12-11 21:58:54 +00:00
Felipe Leme
eb8ab98681
Added MANAGE_USERS to CarProvision.
...
Test: manual verification
Bug: 172691310
Change-Id: Ief2fed98686627cd9f54b03793eed8e4d4678ab0
2020-12-11 13:52:48 -08:00
Nate Myren
471f8cec33
DO NOT MERGE Add RECORD_AUDIO_OUTPUT app op
...
To be used when recording app output via the REMOTE_SUBMIX source
Test: presubmit
Bug: 173797503
Change-Id: I5851197ae42fb431f3b89c961e46b9f9e77d3eab
2020-12-11 21:41:59 +00:00
Eugene Susla
1b3876a619
Merge "API for CDM wake-up opt-in"
2020-12-11 21:18:52 +00:00
TreeHugger Robot
c0ef54bc66
Merge "Avoid calling getTopMostTask() twice in Task#fillTaskInfo()"
2020-12-11 21:10:38 +00:00
Treehugger Robot
654d1ef544
Merge "Bluetooth: Check state correctly when client wants to bind" am: d77aaf6a6e am: 4e1fe29cf0 am: c8f2295f67
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1524638
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia6463c8f6a801cd9db54afa30df0aa3f16b09891
2020-12-11 21:00:36 +00:00
Soonil Nagarkar
018a3adbd5
Merge "Restore get/setExtras per API council feedback"
2020-12-11 20:57:15 +00:00
TreeHugger Robot
f4bb783cbe
Merge "Move a subset of PermissionManager APIs into LegacyPermissionManager."
2020-12-11 20:40:57 +00:00
Shawn Willden
f5a002c222
Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."
...
Revert "Revert "Keystore 2.0: Move keymint spec to security name..."
Revert "Revert "Keystore 2.0: Move keymint spec to security name..."
Revert^2 "Remove references to keymint1"
34536a352803a08776cc4f373d93a94e1fcbf98e
Bug: 175345910
Bug: 171429297
Change-Id: I694e677e4e20419440f12cb7981f0c0c4ca29e08
2020-12-11 20:36:10 +00:00
jinseok83.kim
f1c2b27509
Supported IWLAN Fail Cause
...
If IWLAN connection or handover failure occurs
with specific fail cause as specified in the standard.
Frameworks supports error handling for each IWLAN error cause.
Bug: 165778020
Change-Id: Iefd3c2b1a042d70c411f020b5e67792bac95abb4
Signed-off-by: Jinseok Kim <jinseok83.kim@lge.com >
2020-12-11 20:34:50 +00:00
TreeHugger Robot
3d8a47bdbc
Merge "Fix padding in QQS so tiles only move vertically in portrait"
2020-12-11 20:19:38 +00:00
Henry Fang
f97fff7cc6
Don't open frontend device if it's a shared frontend
...
bug: 175255961
Test: manual
Change-Id: Ib8c9704ebd1c518a84b8526172ca2fe3d087db87
2020-12-11 12:14:49 -08:00
Eino-Ville Talvala
5d8bb26337
Change android.testPatternData --> android.control.testPatternData
...
Test: Builds
Bug: 173154486
Change-Id: I0b47857d3c223c31035b9376c3a626cbce4a1826
2020-12-11 12:13:06 -08:00
Treehugger Robot
c8f2295f67
Merge "Bluetooth: Check state correctly when client wants to bind" am: d77aaf6a6e am: 4e1fe29cf0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1524638
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1d0e3a6b8d539e3b26981f3b4080f37ed20a34d9
2020-12-11 20:09:08 +00:00
Vishnu Nair
379f1eb654
Revert^3 Flip BLAST for SurfaceView"
...
This reverts commit 2b5f28a558 .
Reason for revert: breaks youtube presubmit tests.
Bug: 175396534
Change-Id: I0f79570bb9fbc4ba21068902285e6263491b506e
2020-12-11 19:47:32 +00:00
Treehugger Robot
4e1fe29cf0
Merge "Bluetooth: Check state correctly when client wants to bind" am: d77aaf6a6e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1524638
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I30180ec8e75f6c619dbe8492e74324d2e38d6a3f
2020-12-11 19:46:48 +00:00
Cassie Wang
258e8ff1f4
Change AppSearch querier from component to package.
...
Test: atest com.google.android.config.pts.ConfigTestCase
Bug: 169883602
Change-Id: I78c3e1a58351f15e02c62f32b6ca35d7cc5c05a5
2020-12-11 11:30:24 -08:00
Daniel Bright
73cc15b505
Merge "Hide NO_THROTTLE_EXPIRY_TIME"
2020-12-11 19:25:10 +00:00
Chris Li
191d03bc43
Allow TaskDisplayArea to have TaskDisplayArea children (2/n)
...
- Small clean up of several usages of
forAllTaskDisplayArea(tda -> forAllRootTasks(...)) to forAllRootTasks.
Bug: 175136051
Test: manual for refacotor
Change-Id: Icd67b807cc71d3aa1d693d4fc5ba91a2cf14bae3
2020-12-11 11:21:50 -08:00
Treehugger Robot
d77aaf6a6e
Merge "Bluetooth: Check state correctly when client wants to bind"
2020-12-11 19:13:44 +00:00
Hansong Zhang
73802a1802
Bluetooth: Check state correctly when client wants to bind
...
Use mState instead of mEnable to check Bluetooth server status.
mEnable is used to indicate whether the next action is enabling or
disabling the Bluetooth stack, whereas mState indicates the current
state.
Test: atest FrameworksServicesTests
Bug: 173941366
Change-Id: Id85494f7f40a0201061e74fbf3f08f70a632a62c
2020-12-11 19:13:26 +00:00
Evan Severson
df179c3d04
Merge changes I32ab8848,If470bc9a
...
* changes:
Notify if a sensor is used but privacy is enabled
Add flags to onOpNoted/Started callbacks
2020-12-11 18:36:17 +00:00
Soonil Nagarkar
f0465425c8
Merge "Location OWNERS updates" am: 2e8693718c am: c02e647603 am: c568376083
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic48a74d51cf700cf8c737c27cd8f94b6ac25d404
2020-12-11 18:34:25 +00:00
Makoto Onuki
f18887693e
Merge "Give START_FOREGROUND_SERVICES_FROM_BACKGROUND to S apps"
2020-12-11 18:33:50 +00:00
Jorim Jaggi
a285aff417
Merge "Provide vsync id for all animation transactions (except PIP)"
2020-12-11 18:28:23 +00:00
Soonil Nagarkar
c568376083
Merge "Location OWNERS updates" am: 2e8693718c am: c02e647603
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5ce1a488245ace43382c0e53a2bdd146e111cf6c
2020-12-11 18:21:14 +00:00
Soonil Nagarkar
c02e647603
Merge "Location OWNERS updates" am: 2e8693718c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I88e10902ac8e05b49e9036a1304e808c82baa406
2020-12-11 17:29:08 +00:00