559013 Commits

Author SHA1 Message Date
Hansong Zhang
2b7a7f8ec9 Merge "Bluetooth airplane listener: Check for null" 2020-12-10 20:36:01 +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
Brad Ebinger
39dd3d8868 Merge "Add SipDelegateConnection#closeDialog" 2020-12-10 19:37:04 +00:00
Michael Groover
05c699d02e Merge "Add OWNERS for sensor privacy" 2020-12-10 19:24:46 +00:00
Treehugger Robot
e80c5b3335 Merge "Add a mutability flag to the PendingIntent" 2020-12-10 16:27:58 +00:00
Treehugger Robot
d8cd3c7d2d Merge "HDMICEC: Change hashcode for HdmiPortInfo" 2020-12-10 15:59:53 +00:00
Paul Hu
1ddb4889b6 Merge "Address leftover comments" 2020-12-10 15:47:27 +00:00
Jeff Sharkey
8b102a5988 Merge "Additional per-file OWNERS for shared directories." 2020-12-10 15:41:01 +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
Paul Duffin
17e6d5b6a3 Merge "Unbundle i18n API from android-non-updatable" 2020-12-10 15:19:17 +00:00
Jeff Sharkey
c9dc68f063 Merge "Update OWNERS info for NetworkPolicy related files." 2020-12-10 14:33:07 +00:00
paulhu
508ebddc46 Add a mutability flag to the PendingIntent
From S, it's required to specify explicitly either FLAG_MUTABLE
or FLAG_IMMUTABLE when creating a PendingIntent. Thus, add a
mutability flag to the PendingIntent in ConnectivityServiceTest
that doesn't specify it before.

Bug: 173157160
Test: atest FrameworksNetTests
Change-Id: I755c53b90d709dfbac576dc076722476c3edee35
2020-12-10 12:28:14 +00:00
Paul Duffin
5a4e8f234d Unbundle i18n API from android-non-updatable
This removes the i18n source from the non-updatable stubs which removes
them from the frameworks/base/core/api files too. The API is still
protected by both the build and Gerrit review as the API is specified
in the external/icu/android_icu4j/api/public/ directory.

The i18n stubs source is used instead of the implementation source for
generating the JavaDoc. That revealed a minor issue with metalava which
is fixed in this topic.

The i18n stubs library was statically included alongside the conscrypt
stubs library so it will still appear in the monolothic android.jar.

Bug: 174344410
Test: m offline-sdk-docs
      - check that i18n classes are present
      m android_stubs_current android_system_stubs_current android_test_stubs_current
      - check that i18n classes are present in each jar
      m droid
Change-Id: I744c8bac54a8a5518ca0eca2a7700abbfa0997f4
2020-12-10 11:23:19 +00:00
Lucas Lin
d0c6af4b5f Merge "Reimplement DumpUtils#checkDumpPermission() in ConnectivityService" 2020-12-10 10:57:58 +00:00
Ulyana Trafimovich
af5dab1cb3 Merge "Add <uses-library> information." 2020-12-10 10:19:34 +00:00
Treehugger Robot
a048b25ee9 Merge "Add VcnManagementService owners" 2020-12-10 09:18:53 +00:00
Treehugger Robot
7225913863 Merge "[Mainline] Network netId to getNetId() migration" 2020-12-10 08:47:27 +00:00
Sudheer Shanka
7012c9e873 Update OWNERS info for NetworkPolicy related files.
Test: n/a
Change-Id: I8abcde37bd76bc1078119ca10232a46130668306
2020-12-10 08:19:35 +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
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
a0f97a84e4 Merge "Add owners to gesture detection code" 2020-12-10 03:51:45 +00:00
Xin Li
201f2cf86d Merge "DO NOT MERGE - Merge Android R QPR1" 2020-12-10 02:18:27 +00:00
Xin Li
8f9b6894f1 DO NOT MERGE - Merge Android R QPR1
Bug: 172690556
Merged-In: Ib81ba3288a986546bc570c3759c55d026add591a
Change-Id: I2acfeb6cfc83a80056a685355cc367a5514da069
2020-12-09 17:55:44 -08:00
Agatha Man
3cfbcbee16 Remove accidentally added diff file
Bug: 169889379
Test: presubmit
Change-Id: Ib81ba3288a986546bc570c3759c55d026add591a
2020-12-09 17:49:54 -08: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
Serik Beketayev
a086c295e7 Merge "[Mainline Migration] Migrate NetworkUtils" 2020-12-09 23:47:05 +00:00
Baligh Uddin
8f2e0ec950 Merge "Migrate apex/statsd -> packages/modules/StatsD/apex" into stage-aosp-master 2020-12-09 22:51:28 +00:00
Felipe Leme
f06c01f493 Merge "Added OWNERS for data/etc/car" am: cabc628f66
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521011

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0e337d54e9dcd9cac669656c501dde3d6185e3b
2020-12-09 22:09:36 +00:00
Felipe Leme
cabc628f66 Merge "Added OWNERS for data/etc/car" 2020-12-09 21:54:11 +00:00
Felipe Leme
a931fce1ae Added OWNERS for data/etc/car
Test: none
Bug: 170333009

Exempt-From-Owner-Approval: automotive-specific directory

Change-Id: I92cd4ca6bab38b5297f77356ee1f035d412d3a3c
2020-12-09 21:52:54 +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
Brad Ebinger
3011f5beb4 Add SipDelegateConnection#closeDialog
Add an API for IMS application to notify the SipDelegate when
to close the dialog and release all routing resources associated
with it.

Bug: 173833985
Test: atest CtsTelephonyTestCases:SipDelegateManagerTest
Change-Id: I7638c1d3a8e117f604a83ea241c5ec158f33a186
2020-12-09 21:11:48 +00:00
Jeff Sharkey
08715462b9 Merge "Add mobi extensions to known mime types" am: 806aa0b377
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1514851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I726c027d51fb6b6c303ed7e6995197307e186bb0
2020-12-09 20:26:06 +00:00
Jeff Sharkey
806aa0b377 Merge "Add mobi extensions to known mime types" 2020-12-09 19:14:56 +00:00
Sai Rijal
eeb1257df8 Add mobi extensions to known mime types
Allow .prc/.mobi file extensions to be read as a separate
mobi mime type. This allows Android to open mobi files
with the correct mime type.

This in turn allows applications to set their intent filters
based on mime type when opening mobi files.

Test: CtsMimeMapTestCases
Change-Id: I2b8f80f019f930f888e8e50db8b4efee0f0d4035
2020-12-09 11:03:14 -08:00
Jeff Sharkey
b76f77b9b0 Merge "Add OWNERS to HDMI control directories" am: fd2f7c893a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519668

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d8dd902baec65abec93557d00a22ad3fcd66347
2020-12-09 18:02:00 +00:00
Jeff Sharkey
fd2f7c893a Merge "Add OWNERS to HDMI control directories" 2020-12-09 17:39:01 +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
Lorenzo Colitti
039ed698f1 Observe mOwnerUID in NetworkCapabilities#equals.
Currently, NetworkCapabilities's equals and hashCode methods
ignore mOwnerUID. This is confusing because it is inconsistent
with pretty much every other member of this class.

Bug: 175188445
Test: atest CtsNetTestCases:NetworkAgentTest \
            CtsNetTestCases:Ikev2VpnTest \
	    CtsNetTestCases:VpnServiceTest HostsideVpnTests \
	    CtsNetTestCases:android.net.cts.ConnectivityDiagnosticsManagerTest \
	    ConnectivityServiceTest com.android.server.connectivity.VpnTest
Change-Id: I2348b7a35f32a931687f2d3c2fa57620a12fe06f
2020-12-09 19:33:32 +09:00
Marvin Ramin
3b69e14e9a Add OWNERS to HDMI control directories
Test: n/a
Change-Id: I8e77822bb0a87c8b397be28d60528a35b0eda7b2
2020-12-09 09:47:16 +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
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
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