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
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
Chinmay Dhodapkar
32e1818fb1
Merge "Supported IWLAN Fail Cause"
2020-12-11 23:32:54 +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
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
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
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
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
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
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
Soonil Nagarkar
2e8693718c
Merge "Location OWNERS updates"
2020-12-11 17:12:03 +00:00
Wale Ogunwale
926aa8da2c
Merge "Add more OWNERS coverages" am: 32ff0144bf am: 60f676c7d6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519794
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I32e5f8566ba916c892898f3f521a5a4309646142
2020-12-11 16:58:45 +00:00
Wale Ogunwale
60f676c7d6
Merge "Add more OWNERS coverages" am: 32ff0144bf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519794
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I11e8912fee836209a9f09786362257c4363c7d76
2020-12-11 16:52:17 +00:00
Jeff Sharkey
a5af59c5f8
Merge "OWNERS: exempt current.txt files" am: 16c075f6be am: 4155d4cc37
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525999
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9c040c60741a0c7298b7e9524e04df1aa282bc79
2020-12-11 16:52:15 +00:00
Wale Ogunwale
32ff0144bf
Merge "Add more OWNERS coverages"
2020-12-11 16:25:27 +00:00
Tyler Gunn
108dd94479
Grant CHANGE_DEVICE_IDLE_TEMP_WHITELIST to call log provider.
...
The call log provider needs to grant an allow-list exemption in
broadcast options when sending the ACTION_NEW_VOICEMAIL intent to it's
directed recipient. This is required so that the voicemail app can
start a background service to do some time consuming (but timely) work
in the background upon receiving the intent.
Test: Manual test with Call log provider.
Bug: 173155475
Change-Id: I3e84d65292ec74ffe374fc997e57c4c688f71b9d
Merged-In: I3e84d65292ec74ffe374fc997e57c4c688f71b9d
2020-12-11 16:14:37 +00:00
Jeff Sharkey
4155d4cc37
Merge "OWNERS: exempt current.txt files" am: 16c075f6be
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525999
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I134bbb61735b03e177636df56b9d28e4b41fb624
2020-12-11 15:48:43 +00:00
Jeff Sharkey
16c075f6be
Merge "OWNERS: exempt current.txt files"
2020-12-11 15:33:40 +00:00
Adrian Roos
0632ddf6f6
OWNERS: exempt current.txt files
...
API current.txt files are already covered by the API-Review label through
https://android.git.corp.google.com/All-Projects/+/refs/meta/config/rules.pl#226 .
Test: n/a
Change-Id: Ib0f8272cc4dfe58b41804ef8c0951b7026cd0a59
2020-12-11 16:14:44 +01:00
Tobias Thierer
50ce57e58f
Merge changes from topic "bug158482162_rvc-qpr-dev-rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp
...
* changes:
BackupManagerService: Make new behavior conditional on ChangeId.
Enforce BACKUP permission on Service end.
2020-12-11 13:35:26 +00:00
Orion Hodson
1de159412b
Merge "Revert "Keystore 2.0 SPI: Move keymint spec to security namespace."" am: bc641a41d8 am: 9e21ecbcb4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525805
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic1261e549180816219b7a3c4a7f73a5ce97c5119
2020-12-11 13:31:37 +00:00
Orion Hodson
9e21ecbcb4
Merge "Revert "Keystore 2.0 SPI: Move keymint spec to security namespace."" am: bc641a41d8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525805
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I41900ac6d25d2c97b9222f116675ef0834e7196d
2020-12-11 12:51:16 +00:00
Orion Hodson
bc641a41d8
Merge "Revert "Keystore 2.0 SPI: Move keymint spec to security namespace.""
2020-12-11 12:29:46 +00:00
Vadim Caen
1d746f6ece
Merge "Adding Natanieljr@ to flicker owners" am: 51fa9312f4 am: 36a33d2e04
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518586
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba16feeff3ea7e316bf2426a05820f6ddc3c9f28
2020-12-11 12:12:34 +00:00
Vadim Caen
36a33d2e04
Merge "Adding Natanieljr@ to flicker owners" am: 51fa9312f4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518586
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I474f709ba96e5ebd2244f97160448a6ae8296344
2020-12-11 11:38:01 +00:00
Vadim Caen
51fa9312f4
Merge "Adding Natanieljr@ to flicker owners"
2020-12-11 11:23:22 +00:00
Charles Chen
09f4e85ac2
Add more OWNERS coverages
...
Test: manual
Bug: 174932174
Change-Id: Ia798bdbce8516a3d675c55028ab637ad7f0695cf
2020-12-11 19:16:38 +08:00
Paul Hu
5503eaee00
Merge "Replace PackageManager @hide APIs" am: 18cf9c197a am: 8804e02285
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523340
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I018004ee98ac6b9fada57972ca2affeb94ef4956
2020-12-11 10:49:04 +00:00
Orion Hodson
6acd9c63e7
Revert "Keystore 2.0 SPI: Move keymint spec to security namespace."
...
Revert "Keystore 2.0: Move keymint spec to security namespace."
Revert "Keystore 2.0: Move keymint spec to security namespace."
Revert "Move keymint to android.hardware.security."
Revert "Configure CF to start KeyMint service by default."
Revert "Move keymint to android.hardware.security."
Revert "Move keymint to android.hardware.security."
Revert submission 1522123-move_keymint
Reason for revert: Build breakage
Bug: 175345910
Bug: 171429297
Reverted Changes:
Ief0e9884a:Keystore 2.0: Move keymint spec to security namesp...
Idb54e8846:Keystore 2.0: Move keymint spec to security namesp...
I9f70db0e4:Remove references to keymint1
I2b4ce3349:Keystore 2.0 SPI: Move keymint spec to security na...
I2498073aa:Move keymint to android.hardware.security.
I098711e7d:Move keymint to android.hardware.security.
I3ec8d70fe:Configure CF to start KeyMint service by default.
Icbb373c50:Move keymint to android.hardware.security.
I86bccf40e:Move keymint to android.hardware.security.
Change-Id: Icd279f358db2387bf2bf232b0548762fab51e67d
2020-12-11 10:45:43 +00:00
Paul Hu
8804e02285
Merge "Replace PackageManager @hide APIs" am: 18cf9c197a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523340
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4e2fab962ba401f2c941c58c0eb2210a8f835e7
2020-12-11 10:05:38 +00:00
Paul Hu
18cf9c197a
Merge "Replace PackageManager @hide APIs"
2020-12-11 09:50:28 +00:00
Robert Luo
1826155ca1
[automerger skipped] Merge "Migrate media output switcher metrics - 1/n" into rvc-qpr-dev am: 08652b64e2 -s ours
...
am skip reason: Change-Id I0fea0c59afcb44fc1d22920036107524f221a7be with SHA-1 616339c1d0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13185403
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id940bade9da74e26d832a556a90272dadcf4a35a
2020-12-11 07:13:10 +00:00
Robert Luo
08652b64e2
Merge "Migrate media output switcher metrics - 1/n" into rvc-qpr-dev
2020-12-11 06:56:24 +00:00
Paul Hu
39f344f26b
Merge "Expose TcpRepairWindow as module-lib API" am: f24f42ad0f am: 993efbdf84
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519961
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7a125dfa9b4bccc9e8943c4b972ff8cb25d4ccaf
2020-12-11 06:31:07 +00:00
Paul Hu
993efbdf84
Merge "Expose TcpRepairWindow as module-lib API" am: f24f42ad0f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519961
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2621e4f244e70dfdbd6e6e228f9c6401326fc56a
2020-12-11 06:15:36 +00:00
Paul Hu
f24f42ad0f
Merge "Expose TcpRepairWindow as module-lib API"
2020-12-11 05:37:10 +00:00
Chalard Jean
0e91f659ba
Merge changes from topic "remove_legacy_NA" am: 362fc1ca1f am: c65281e9c4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456097
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I87cc62579b19699438704f472fc754837d878038
2020-12-11 03:29:50 +00:00
Lucas Lin
f8816479a3
Merge "Use getUserHandles() instead of getUsers() to get user id" am: 6bb994193c am: b35b88df27
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513050
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id16394df0ad8e97efe8e75c00a406242a1cac206
2020-12-11 03:29:25 +00:00
Chalard Jean
c65281e9c4
Merge changes from topic "remove_legacy_NA" am: 362fc1ca1f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456097
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I141e67982f1119d5fc700ed2cb75e2f8220f5383
2020-12-11 02:40:14 +00:00
Lucas Lin
b35b88df27
Merge "Use getUserHandles() instead of getUsers() to get user id" am: 6bb994193c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513050
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e03c6f4317e11ffe64b7bcf170f70f535995e85
2020-12-11 02:37:54 +00:00
Chalard Jean
362fc1ca1f
Merge changes from topic "remove_legacy_NA"
...
* changes:
Remove support for legacy network agents
Remove deprecated constructors for NetworkAgent
Migrate NetworkAgentWrapper to the new NA API
Cleanup TestNetworkService
2020-12-11 02:32:57 +00:00
Robert Luo
55bb21ba01
Merge "Migrate media output switcher metrics - 2/n" into rvc-qpr-dev-plus-aosp
2020-12-11 02:15:47 +00:00
Lucas Lin
6bb994193c
Merge "Use getUserHandles() instead of getUsers() to get user id"
2020-12-11 02:02:37 +00:00
Tobias Thierer
c6d183923c
BackupManagerService: Make new behavior conditional on ChangeId.
...
Base CL ag/12885739 introduced unconditional enforcement of the BACKUP
permission for callers of BackupManagerService.isBackupServiceActive()
in the service, but dropped the enforcement on the app process side
(BackupManager).
This CL makes the behavior change conditional on a compat ChangeId.
Bug: 158482162
Test: Manually checked that an app similar to the code sample from
http://b/158482162#comment1 can reproduce the behavior.
This is true both before the base CL and after this CL, when
the app targets an old SDK version (26).
Test: Checked that both (a) before this CL, (b) after this CL where
the change is manually enabled for the app via the below commands,
the app runs into a SecurityException instead:
$ adb shell am compat enable 158482162 com.example.tester
$ adb shell dumpsys platform_compat | grep 158482162
ChangeId(158482162; name=IS_BACKUP_SERVICE_ACTIVE_ENFORCE_PERMISSION_IN_SERVICE; enableSinceTargetSdk=31; packageOverrides={com.example.tester=true})
Change-Id: I58e5d2a0b438296137fd76720636c8fdce740ded
Merged-In: I58e5d2a0b438296137fd76720636c8fdce740ded
(cherry picked from commit 7671f0d95c )
2020-12-11 00:53:23 +00:00
Tobias Thierer
79192da3f3
Enforce BACKUP permission on Service end.
...
BackupManager runs in the client process, whereas BackupManagerService
runs in the system server process. Therefore, apps permissions need should
be enforced on the service side.
Bug: 158482162
Test: Manually checked that a sample app encounters SecurityException
after but not before this CL, when running code similar to the
sample in http://b/158482162#comment1 to figure out whether
isBackupServiceActive() for its own uid.
Change-Id: I59693819542a80a065a9c88373393b0ba0dbef65
Merged-In: I59693819542a80a065a9c88373393b0ba0dbef65
(cherry picked from commit b2ab2c414f )
2020-12-11 00:50:23 +00:00
Treehugger Robot
1c60ee31ac
Merge "Add O-O TLMs to top-level owners" am: 0c04c92306 am: 736b9d9629
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523822
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic70f20fdc78f3f23051d84256c9d53cc324bbf46
2020-12-11 00:43:27 +00:00
Treehugger Robot
736b9d9629
Merge "Add O-O TLMs to top-level owners" am: 0c04c92306
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523822
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifb6d87611a345e7042cdf491fd28b4ac555635b5
2020-12-11 00:07:37 +00:00