Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
561,675 Commits 3 Branches 0 Tags
ea91bdb31eb8e6c09559f174ca983d9097c8a929
Commit Graph

561675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
ea91bdb31e Merge "Fix a crash in eng builds" am: 0fc25a8693 am: 4fb275ef08 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9e83003de2a3a0b227ca558264403be312fa1e6
 2020-12-14 06:11:21 +00:00
Treehugger Robot
4fb275ef08 Merge "Fix a crash in eng builds" am: 0fc25a8693 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I245a8498d89e73fefa448a23d71a30d3f34b56ca
 2020-12-14 05:50:17 +00:00
Treehugger Robot
0fc25a8693 Merge "Fix a crash in eng builds" 2020-12-14 05:17:15 +00:00
Chiachang Wang
fced6020f8 Merge "Resolve UidRange dependency between NMS and CS module" am: c3806f72b7 am: d7795cd590 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495869

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If34efef1e3b485de6c93f78c4401ea92fa8edfe4
 2020-12-14 03:49:42 +00:00
Chiachang Wang
d7795cd590 Merge "Resolve UidRange dependency between NMS and CS module" am: c3806f72b7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495869

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e55c3c4bed3d71eb48242428c179809aae00a1f
 2020-12-14 03:10:01 +00:00
Chiachang Wang
c3806f72b7 Merge "Resolve UidRange dependency between NMS and CS module" 2020-12-14 02:55:41 +00:00
Treehugger Robot
0db017d837 Merge "[Bugfix]audio:fix NPE when buildBluetoothRoutes" am: b801d3549f am: 62621db913 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519791

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8805f00edfc3f01e39703063bb3ae66b26f686e7
 2020-12-14 02:23:39 +00:00
Treehugger Robot
62621db913 Merge "[Bugfix]audio:fix NPE when buildBluetoothRoutes" am: b801d3549f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519791

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I849ac5c7d88cbde748881d4aa85f5bacf9345d91
 2020-12-14 01:46:14 +00:00
Treehugger Robot
b801d3549f Merge "[Bugfix]audio:fix NPE when buildBluetoothRoutes" 2020-12-14 01:33:36 +00:00
Chalard Jean
fb0ff9bbcf Fix a crash in eng builds 
CAPTIVE_PORTAL is a CS-managed capability, and causes CS to log a wtf.
When this test is run on an eng build, this sends SIGSEGV to the test,
which is pretty difficult to debug.

Test: FrameworksNetTests NetworkStackTests
Change-Id: I72fc46a6daa4e886425b4dc967318cca9f1a5302
 2020-12-13 23:02:08 +09:00
Trung Lam
bcd913f08e Merge "Fix issue with saving protos to disk during shutdown." into rvc-qpr-dev am: 0943ebe36d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13203025

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40be559cdb840da61cb008a849e9807c9475363b
 2020-12-13 10:08:47 +00:00
Trung Lam
0943ebe36d Merge "Fix issue with saving protos to disk during shutdown." into rvc-qpr-dev 2020-12-13 09:56:40 +00:00
Cole Faust
0142607742 Merge "Add rotary highlight to switches" into rvc-qpr-dev am: c28fb42e29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13211155

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c85c22df09b85c1c7a051fa750014354923ba7c
 2020-12-12 04:52:44 +00:00
Cole Faust
c28fb42e29 Merge "Add rotary highlight to switches" into rvc-qpr-dev 2020-12-12 04:11:13 +00:00
Treehugger Robot
03ced7e52e Merge "Add missing IMF OWNERS" am: 4e3959e571 am: 30497d0911 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525813

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3534455778648e6be10ffedbd2d692656d88d318
 2020-12-12 02:14:04 +00:00
Treehugger Robot
30497d0911 Merge "Add missing IMF OWNERS" am: 4e3959e571 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525813

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b85f391e4634fa2596f7469cfb58d7917c9a8a7
 2020-12-12 01:51:20 +00:00
Treehugger Robot
4e3959e571 Merge "Add missing IMF OWNERS" 2020-12-12 01:20:23 +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
Cole Faust
0be508c166 Add rotary highlight to switches 
Since the rotary highlight has to expand
around the switch, the switch view
must be made bigger. The switch
was smaller than the minimum touch
target anyways, so this should
be an ok change to make.

Bug: 174490425
Test: Manually
Change-Id: Ie34969cf7085835cad901aa4c542ab0d206b98a4
 2020-12-11 16:39:29 -08: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
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
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
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
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
Adrian Roos
bb4c35d0d2 Add missing IMF OWNERS 
Test: n/a
Change-Id: Ib1ec672f872a3b1faf65c3583e300f473bac8f0c
 2020-12-11 17:02:19 +01: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