Commit Graph

559042 Commits

Author SHA1 Message Date
Wale Ogunwale
32ff0144bf Merge "Add more OWNERS coverages" 2020-12-11 16:25:27 +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
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
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
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
18cf9c197a Merge "Replace PackageManager @hide APIs" 2020-12-11 09:50:28 +00:00
Paul Hu
f24f42ad0f Merge "Expose TcpRepairWindow as module-lib API" 2020-12-11 05:37:10 +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
Lucas Lin
6bb994193c Merge "Use getUserHandles() instead of getUsers() to get user id" 2020-12-11 02:02:37 +00:00
Treehugger Robot
0c04c92306 Merge "Add O-O TLMs to top-level owners" 2020-12-10 23:49:46 +00:00
Shawn Willden
f0c3865132 Merge "Keystore 2.0 SPI: Move keymint spec to security namespace." 2020-12-10 22:49:14 +00:00
Hui Wang
4c9e7a8d0c Merge "Support Gba Api" 2020-12-10 22:40:07 +00:00
Jordan Liu
beb163c655 Merge "Add API for setting SIM power "synchronously"" 2020-12-10 21:46:30 +00:00
Jeff Sharkey
694df14654 Merge "configure owners for ShortcutInfo" 2020-12-10 21:36:20 +00:00
Jorim Jaggi
58ae83981d Add O-O TLMs to top-level owners
Change-Id: I4785795e4bb9f232ae41674bb56322f5c97871bb
2020-12-10 21:24:38 +00:00
Pinyao Ting
5df24bca42 configure owners for ShortcutInfo
Bug: 151359749
Test: manual
Change-Id: Ic3f338083402f2c189f36b8ec9db502e11e50a55
2020-12-10 13:13:26 -08:00
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
Hui Wang
bfc6cd7483 Support Gba Api
Added api to support generic authentication architecture.

Bug: 154865133
Test: atest cts/tests/tests/telephony/current/src/android/telephony/gba/cts/
Test: manual by GbaTestApp
Merged-In: I9aea4c8bc2123b6d00c4a8ddf9901c885d2742d2
Change-Id: I9aea4c8bc2123b6d00c4a8ddf9901c885d2742d2
2020-12-10 18:02:19 +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
paulhu
9c981adba4 Replace PackageManager @hide APIs
ConnectivityService is using
PackageManager#getApplicationInfoAsUser() to get application
info but this API is not able to call after CS becomes a
mainline module. Thus, replace it with formal API.

Bug: 170593746
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLegacyApi22
Change-Id: Idd1269aa50e234801583097bb6f40b099bab8fba
2020-12-10 23:32:32 +08: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
lucaslin
fefbeecb4b Use getUserHandles() instead of getUsers() to get user id
UserManager#getUsers() is a hidden API, use getUserHandles() to
get user id instead in PermissionMonitor.

Bug: 171529940
Test: atest FrameworksNetTests
Change-Id: Ic304627688de8e49505a95ebc99628b2e0eafab9
2020-12-10 13:58:39 +08: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