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

71215 Commits

Author SHA1 Message Date
Hansong Zhang
e2654876bf Merge "Bluetooth airplane listener: Check for null" am: 2b7a7f8ec9 am: 38a83f01dc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie79caa23186d242a98edde73241e629989e8dfbd
 2020-12-10 21:07:20 +00:00
Hansong Zhang
b49f866054 Bluetooth airplane listener: Check for null 
Check mAirplaneHelper != null before accessing it.  Note that this can
be null if Settings.Global.RADIO_BLUETOOTH is enabled in
AIRPLANE_MODE_RADIOS.  We don't need to disable Bluetooth if it's
allowed in airplane mode.

Test: atest FrameworksServicesTests
Bug: 174254527
Change-Id: I93ae4ec6b75b7ffb8e75848d7779ab64593221bd
 2020-12-10 20:35:50 +00:00
Michael Groover
272b06dce4 Merge "Add OWNERS for sensor privacy" am: 05c699d02e am: f2c250acb9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520165

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c6999ee0d59f4424cced74423c174bcfcdeeaa3
 2020-12-10 19:48:56 +00:00
Michael Groover
05c699d02e Merge "Add OWNERS for sensor privacy" 2020-12-10 19:24:46 +00:00
Paul Hu
b91a2d415f Merge "Address leftover comments" am: 1ddb4889b6 am: 5c19cb00cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03a2140e5574088fd0768e3ac8e3f47e54c98b6d
 2020-12-10 16:32:51 +00:00
Jeff Sharkey
845bfdd0ba Merge "Additional per-file OWNERS for shared directories." am: 8b102a5988 am: 7a9f3e10de 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523618

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9df0f96893728df43b3ae402ac69ec3e02079f51
 2020-12-10 16:32:34 +00:00
Paul Hu
1ddb4889b6 Merge "Address leftover comments" 2020-12-10 15:47:27 +00:00
Jeff Sharkey
e2cc3f8bec Additional per-file OWNERS for shared directories. 
Iteration based on areas of tree where detailed ownership was found
to be missing during routine code reviews.

Also add more detailed examples to OWNERS.md.

Bug: 174932174
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I46ccef33b34594181ae8dc62973d68020f827d6b
 2020-12-10 08:37:23 -07:00
Lucas Lin
37bc327902 Merge "Reimplement DumpUtils#checkDumpPermission() in ConnectivityService" am: d0c6af4b5f am: a7ae56b380 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519792

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52b048b4ecd3f228c7d13aafeaa6bd852f564a46
 2020-12-10 11:15:16 +00:00
Lucas Lin
d0c6af4b5f Merge "Reimplement DumpUtils#checkDumpPermission() in ConnectivityService" 2020-12-10 10:57:58 +00:00
Treehugger Robot
131a515878 Merge "Add VcnManagementService owners" am: a048b25ee9 am: 49931b4ba7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520919

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9785a70e2567fdf5722d4153a679e0d9f0afb2e3
 2020-12-10 10:25:36 +00:00
Treehugger Robot
ce461d3660 Merge "[Mainline] Network netId to getNetId() migration" am: 7225913863 am: 983a2fe29b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd1771c329d6b4c45f85d32cf44a7499efddcbfb
 2020-12-10 09:43:15 +00:00
Treehugger Robot
a048b25ee9 Merge "Add VcnManagementService owners" 2020-12-10 09:18:53 +00:00
Lorenzo Colitti
bea9280e6e Merge changes I6eb6d92b,I638e29fd,I2348b7a3 am: 435d580374 am: 55477377da 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521657

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6de299ec480f1a34042d2ef2ee86f00d030510e8
 2020-12-10 09:02:40 +00:00
Treehugger Robot
7225913863 Merge "[Mainline] Network netId to getNetId() migration" 2020-12-10 08:47:27 +00:00
Lorenzo Colitti
435d580374 Merge changes I6eb6d92b,I638e29fd,I2348b7a3 
* changes:
  Add a convenience method to update a network's capabilities.
  Disallow NetworkAgents from changing the owner UID.
  Observe mOwnerUID in NetworkCapabilities#equals.
 2020-12-10 08:11:52 +00:00
Dan Shi
c4d2ea074d Merge "Move CtsMediaTestCases to group presubmit-large" am: 9ca0f614c8 am: 298b6be5e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522241

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I42735750abaac681f530a0171916ce06cd5cd25b
 2020-12-10 07:45:41 +00:00
lucaslin
f303071486 Reimplement DumpUtils#checkDumpPermission() in ConnectivityService 
ConnectivityService is going to be a part of mainline module, to
prevent using @hide method in ConnectivityService, reimplement
DumpUtils#checkDumpPermission() in ConnectivityService.

Bug: 175177794
Test: atest FrameworksNetTests
Test: adb shell dumpsys connectivity
Change-Id: I1e4bc023b39b40a717a3a0fd8cd60aa2f25e9bdb
 2020-12-10 07:12:05 +00:00
Dan Shi
9ca0f614c8 Merge "Move CtsMediaTestCases to group presubmit-large" 2020-12-10 07:02:52 +00:00
Fan Zhang
323de0dd7f Merge "Add owners to gesture detection code" am: a0f97a84e4 am: 0e68592f97 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520906

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd76f1aef9fcd4ed8db4c400bf5a1588c554f413
 2020-12-10 04:55:44 +00:00
Fan Zhang
a0f97a84e4 Merge "Add owners to gesture detection code" 2020-12-10 03:51:45 +00:00
Serik Beketayev
006d043dfe Merge "[Mainline Migration] Migrate NetworkUtils" am: a086c295e7 am: c6218f7977 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498168

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f91f6de3af919fff42383ba86617112624c8292
 2020-12-10 00:49:48 +00:00
Serik Beketayev
c6218f7977 Merge "[Mainline Migration] Migrate NetworkUtils" am: a086c295e7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498168

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc0a49e76f87a741f4410b53e9a40012e37fde36
 2020-12-10 00:08:03 +00:00
Hai Zhang
b39b895716 Merge "Use per-user Shell UID for adoptShellPermissionIdentity()." into rvc-qpr-dev am: 91596432c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13186551

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0597c4aedf0d02fdc16e89c6716d7cb7699c95b3
 2020-12-09 23:53:52 +00:00
Serik Beketayev
a086c295e7 Merge "[Mainline Migration] Migrate NetworkUtils" 2020-12-09 23:47:05 +00:00
Dan Shi
c398ea5913 Move CtsMediaTestCases to group presubmit-large 
The test config takes longer than 15mins to run. Move it to a dedicated
group for running slow presubmit Test Mapping test.

Bug: 174654670
Bug: 174495337
Bug: 175150979
Change-Id: Ib9d7b86ea9bee438383a80a66b5d1c008565ba10
Test: none
 2020-12-09 21:19:56 +00:00
Lorenzo Colitti
a07cabc065 Add a convenience method to update a network's capabilities. 
Almost all calls to ConnectivityService#updateCapabilities use
all the current data in the network, and thus call the method
like this:

    updateCapabilities(nai.getCurrentScore(), nai, nai.networkCapabilities);

Introduce a convenience method to simplify this frequent use case.

Bug: 173331190
Test: passes existing ConnectivityService tests
Change-Id: I6eb6d92bd159f2575d10a929bd59f6dd1b7a4b4e
 2020-12-10 00:41:06 +09:00
Lorenzo Colitti
e4e9d1f97e Disallow NetworkAgents from changing the owner UID. 
The current behaviour with regards to changing the owner UID is
bizarre and arguably incorrect. A NetworkAgent can change the
owner to whatever other app it wants, regardless of signatures,
at any time. This includes, for example, transferring ownership
to another UID and then recovering it.

Fortunately no existing NetworkAgent appears to do this:
- ClientModeImpl sets it to the UID of the app that created the
  configuration. It doesn't look like it can change while the
  network is connected.
- Vpn sets it to the UID of the VPN owner. That also can't change.
- Telephony does not appear to set it at all, it only sets the
  administrator UIDs (and updates them whenever it gets
  EVENT_CARRIER_PRIVILEGED_UIDS_CHANGED).

Disallow this now before code is written that depends on it.

Bug: 175188445
Test: modified tests in ConnectivityServiceTest
Change-Id: I638e29fda2481ec3bf4fff562ea66a73322881df
 2020-12-09 19:47:17 +09:00
Dmitri Plotnikov
0ad8cb5966 Merge "Add per-file OWNERS for BatteryStats" am: cac4499628 am: d8a9268460 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520758

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74d7cc2d030f7a6e78d8c7e9903a48e93301c5c3
 2020-12-09 03:26:47 +00:00
Dmitri Plotnikov
d8a9268460 Merge "Add per-file OWNERS for BatteryStats" am: cac4499628 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520758

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d258d326af6662a7e8d1dcaa1bbbeffdc19da94
 2020-12-09 03:06:09 +00:00
Dmitri Plotnikov
cac4499628 Merge "Add per-file OWNERS for BatteryStats" 2020-12-09 02:32:13 +00:00
Christian Wailes
75064490a8 Merge changes from topic "install-hints" am: 21b065b610 am: 543fdab6ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1482838

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22defc3bb3f0ef354dfad31e21d778b6815aeb5a
 2020-12-09 02:23:52 +00:00
Chris Wailes
2a6f9b05a3 Adds an "install scenario" field to the appropriate datastructures am: d42204a865 am: e2c2f7ec15 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465553

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb120d7fd34ab55c2d01978f01a6ab474d6a5664
 2020-12-09 02:23:45 +00:00
Christian Wailes
543fdab6ab Merge changes from topic "install-hints" am: 21b065b610 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1482838

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d9a22925b9ea70f06954e57f7ce98a5c3cfd3b1
 2020-12-09 01:36:18 +00:00
Michael Groover
cfaac0e759 Add OWNERS for sensor privacy 
Bug: 175159332
Test: Builds
Change-Id: I430d823ced4065df2a5d1f7a4229eb4d5361e82b
 2020-12-08 17:26:23 -08:00
Chris Wailes
e2c2f7ec15 Adds an "install scenario" field to the appropriate datastructures am: d42204a865 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465553

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifeb0c921ec079202dba5b0b50eb147b09ea3042e
 2020-12-09 01:22:52 +00:00
Hai Zhang
66e13bad42 Use per-user Shell UID for adoptShellPermissionIdentity(). 
Previously we were delegating the per-user Shell's permission state and
primary user Shell's app op state to the instrumentation, which is
inconsistent. We should always delegate the per-user Shell's state.

Bug: 170742504
Change-Id: I3773c2fe34f337f5790ba7d85647501a0f86522f
Test: presubmit
(cherry picked from commit e6fe4bc8c5)
 2020-12-09 00:45:40 +00:00
Dmitri Plotnikov
c5afcc503b Add per-file OWNERS for BatteryStats 
Test: N/A

Change-Id: Ie9eef7eed7f097113074c3c5f3f7a7084a55f97b
 2020-12-08 16:38:23 -08:00
Serik Beketayev
a61389568c [Mainline] Network netId to getNetId() migration 
Bug: 175085315
Test: atest
Change-Id: I3d7366ba1e60be3ff7c6dd6c589db760b182136b
 2020-12-08 16:34:38 -08:00
Christian Wailes
21b065b610 Merge changes from topic "install-hints" 
* changes:
  Modify dexopt invocation based on install scenario
  Adds an "install scenario" field to the appropriate datastructures
 2020-12-09 00:00:26 +00:00
TreeHugger Robot
3a49946a6b Merge "AudioService: increase audio mode timeout." into rvc-qpr-dev am: 33229d78b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181178

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b3a582a2f8e5c12f4425733e8b7e1af1efa0172
 2020-12-08 21:22:36 +00:00
Fan Zhang
eb5c0dfe1f Add owners to gesture detection code 
The code is maintained by emergencyinfo owners.

Bug: 160006048
Test: manual
Change-Id: I5e03aa511d52c8595a51ddce5b232f250ecf4c18
 2020-12-08 21:10:39 +00:00
TreeHugger Robot
33229d78b6 Merge "AudioService: increase audio mode timeout." into rvc-qpr-dev 2020-12-08 20:54:28 +00:00
Adam Bookatz
d3439c4204 Merge "OWNERS file update for UserManagerInternal" am: 3a7861281b am: cbb8ec9e22 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519214

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15a3038337611eb9f2b84fc95ae73e43a53ceafb
 2020-12-08 20:44:39 +00:00
Adam Bookatz
cbb8ec9e22 Merge "OWNERS file update for UserManagerInternal" am: 3a7861281b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519214

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id316389aa3d71182fbcd15e76322beadbd30048f
 2020-12-08 19:59:24 +00:00
Adam Bookatz
3a7861281b Merge "OWNERS file update for UserManagerInternal" 2020-12-08 19:39:22 +00:00
Cody Kesting
07dd48319d Merge "Allow the System UID to unregister ConnDiags CBs." into rvc-qpr-dev 2020-12-08 19:31:46 +00:00
Benedict Wong
348ffe4474 Add VcnManagementService owners 
Test: No code changes
Change-Id: I3c1ff347dbddb2a41c186ea8d18133990e39f7c4
 2020-12-08 11:27:03 -08:00
Jeff Sharkey
358f0d4fc8 Merge changes from topic "dec5" am: c2793cf12b am: 9af6ac78b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519384

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2776a545a24f007ccb4b9ee14705978571265ef3
 2020-12-08 16:43:19 +00:00
Jeff Sharkey
24d251403b Improve OWNERS coverage across frameworks/base/. am: fab0ab3c9c am: c7c4a74a78 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519383

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5120a3701af3564f363900b20bca75f3ad2a854c
 2020-12-08 16:43:17 +00:00