Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
441,768 Commits 3 Branches 0 Tags
b75ec096f94af13c35ce0f094e2a6116a4b8a1ff
Commit Graph

106762 Commits

Author SHA1 Message Date
Automerger Merge Worker
6aa3ba16c3 Merge "Allow mainline IPsec(IKE) to statically include @PolicyDirection" am: 17d04f08d6 am: b5189ed2d9 
Change-Id: I40382746ab54ed21fe9d8fc68b2c81bdf2b4e464
 2020-01-10 00:16:11 +00:00
Yan Yan
17d04f08d6 Merge "Allow mainline IPsec(IKE) to statically include @PolicyDirection" 2020-01-09 23:42:59 +00:00
Automerger Merge Worker
b615fa46c9 Merge "Use new UnsupportedAppUsage annotation." am: 70129fc863 am: fe3063fb71 
Change-Id: Iea82f97f0ba766ce3f435630175aea48ca47f12f
 2020-01-09 16:15:31 +00:00
Treehugger Robot
70129fc863 Merge "Use new UnsupportedAppUsage annotation." 2020-01-09 15:46:03 +00:00
Automerger Merge Worker
62e56d9b36 Merge "Add a NetworkProvider class to the SDK." am: f6bbab0f6b am: 80cf87254e 
Change-Id: I6f15335ae03674b1b2d759b2bb7b52607eb9e3e0
 2020-01-09 15:15:05 +00:00
Automerger Merge Worker
0dc138e8f7 Merge "[SP02] Add provider interfaces to system API" am: 2220f75cdf am: c6487568ad 
Change-Id: I569fbcc38f44221ff1be355e48ced65359f2e70f
 2020-01-09 15:14:16 +00:00
Lorenzo Colitti
f6bbab0f6b Merge "Add a NetworkProvider class to the SDK." 2020-01-09 15:09:58 +00:00
Junyu Lai
2220f75cdf Merge "[SP02] Add provider interfaces to system API" 2020-01-09 14:19:37 +00:00
Artur Satayev
d9b11b058c Use new UnsupportedAppUsage annotation. 
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I8789f8499d4dca08580672e9e45ed9a7026dd686
Merged-In: I8789f8499d4dca08580672e9e45ed9a7026dd686
 2020-01-09 13:56:05 +00:00
Automerger Merge Worker
b8a97000e9 Merge "Expose some tethering constants in Settings" am: 07dcca55fc am: 2173a4d07e 
Change-Id: I1231b6fdfb8373dd03ac34649769d90163063bf1
 2020-01-09 12:13:35 +00:00
Lorenzo Colitti
ae5cb71b08 Add a NetworkProvider class to the SDK. 
Bug: 138306002
Test: builds, boots, wifi and telephony work
Test: tested by upcoming change that uses this in NetworkFactory
Change-Id: I2f61bf323215b7c6feff8acc92e7434346751773
 2020-01-09 19:50:26 +09:00
Automerger Merge Worker
e4601e0a58 Merge "[SP01] Add NetworkStats to system API" am: a113464439 am: b340068a3e 
Change-Id: I771bf8836f9b754fc05fd743de8cc5a15aecddf1
 2020-01-09 09:18:36 +00:00
junyulai
4d905c9e73 [SP02] Add provider interfaces to system API 
This change contains a base class that allows external modules
to implement a custom network statistics provider. And a callback
interface that allows the implementation to signal the system.

These interfaces will be used in the follow-up changes that
implement the functionality.

Test: atest FrameworksNetTests CtsUsageStatsTestCases
Test: m doc-comment-check-docs
Bug: 130855321
Change-Id: Ib23377c8b9cef02bc32253462b068fd10734d21a
 2020-01-09 08:57:37 +00:00
markchien
9845e908d0 Expose some tethering constants in Settings 
Make some tethering constants @systemApi because tethering
cannot use hide Api.

Bug: 144814607
Test: build, flash, boot
Change-Id: I8b46e2483eec575cddaad392d055551b75ca71ef
 2020-01-09 08:48:55 +00:00
Junyu Lai
a113464439 Merge "[SP01] Add NetworkStats to system API" 2020-01-09 08:33:24 +00:00
Automerger Merge Worker
66ba1fb6aa Merge "Replace ConnectivityManager constants to TetheringManager" am: 0728d22b39 am: 13a0da47dc 
Change-Id: I91a18dbef23d4f3a4b0c068e61e9a236ecae877f
 2020-01-09 07:02:23 +00:00
Mark Chien
0728d22b39 Merge "Replace ConnectivityManager constants to TetheringManager" 2020-01-09 06:32:04 +00:00
Sarah Chin
df94694c42 Merge "Handle 5G meteredness in telephony framework" 2020-01-09 05:03:24 +00:00
Automerger Merge Worker
658a0373a2 Merge "USB: [Tethering mainline] Expose @hide APIs to @SystemApi" am: d997a3571b am: 62a34ebc11 
Change-Id: I9578c3d1b30c1c747b88a146a691f3280f448039
 2020-01-09 04:33:30 +00:00
Treehugger Robot
d997a3571b Merge "USB: [Tethering mainline] Expose @hide APIs to @SystemApi" 2020-01-09 04:26:36 +00:00
Automerger Merge Worker
0d49b9f5b7 Merge changes I6260695b,I88f00ca4 am: db9335b832 am: 73a0b2491b 
Change-Id: I8d44be12a15d33db6fec6556bf9494ad60fa4c59
 2020-01-09 04:22:26 +00:00
Automerger Merge Worker
e576ba8f8d Merge "(Backport) Pipe through featureId from caller to permission checks in telephony code" am: 0104ce5293 am: f5a037d685 
Change-Id: I09813d60dacabbd98e395816f9d7cb6d965a4f19
 2020-01-09 03:45:21 +00:00
Treehugger Robot
db9335b832 Merge changes I6260695b,I88f00ca4 
* changes:
  Expose clearCapabilities for mainline module
  Expose NetworkSpecifier methods as SystemApi
 2020-01-09 03:43:57 +00:00
junyulai
d27a1725e8 [SP01] Add NetworkStats to system API 
In order to let external module report their network stats,
expose necessary APIs to construct NetworkStats object.

Test: atest FrameworksNetTests CtsUsageStatsTestCases
Test: m doc-comment-check-docs
Bug: 130855321
Change-Id: Id3ec8aaff3df67948c25eac2319a74cf33a27979
 2020-01-09 03:11:22 +00:00
Treehugger Robot
0104ce5293 Merge "(Backport) Pipe through featureId from caller to permission checks in telephony code" 2020-01-09 02:48:14 +00:00
Chiachang Wang
4bcef011b2 Expose clearCapabilities for mainline module 
Support telephony mainline module usage.

Bug: 138306002
Test: Build and make api-stubs-docs-update-current-api
Change-Id: I6260695b01ec06244d2822f9438a7fae83539ff2
Merged-In: I0a462da4e87cae2c7d4a9b9a92de061a086c5752
 2020-01-09 10:25:03 +08:00
Sarah Chin
0b7efca5e6 Merge "Handle 5G meteredness in telephony framework" into qt-qpr1-dev-plus-aosp 2020-01-09 02:23:13 +00:00
Chiachang Wang
914a0fff2e Expose NetworkSpecifier methods as SystemApi 
Support for Wi-Fi mainline module.

Bug: 135998869
Test: build and make system-api-stubs-docs-update-current-api
Test: atest FrameworksNetTests
Change-Id: I88f00ca4f4cd51c71f7668b34f101fe7d1332c5c
Merged-In: Id705ee0f2b5c464f6d8ccc91f20dcb39dcf6f2b8
 2020-01-09 10:22:47 +08:00
James Wei
7d66bd9b54 USB: [Tethering mainline] Expose @hide APIs to @SystemApi 
Bug: 142372304
Test: Manual test: Enable USB tethering
Test: atest UsbTests
Test: atest UsbManagerTests
Change-Id: Ib284b0a72b06ff45b4d3b55a8d48c20f51284a20
 2020-01-09 10:21:34 +08:00
Sarah Chin
1431ab2ee5 Handle 5G meteredness in telephony framework 
Carriers can set override values via SubscriptionManager.
Added constants and configs for 5G meteredness updates.

Bug: 139070884
Bug: 139218397
Test: atest FrameworksTelephonyTests
Test: atest
cts/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java

Change-Id: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
Merged-In: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
(cherry-picked from ag/9302701)
 2020-01-09 02:13:47 +00:00
Sarah Chin
e8aa5acef5 Handle 5G meteredness in telephony framework 
Carriers can set override values via SubscriptionManager.
Added constants and configs for 5G meteredness updates.

Bug: 139070884
Bug: 139218397
Test: atest FrameworksTelephonyTests
Test: atest
cts/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java

Change-Id: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
Merged-In: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
(cherry-picked from ag/9302701)
 2020-01-09 02:13:26 +00:00
Automerger Merge Worker
869646b5ab Merge "PersistableBundle: writeToStream/readFromStream" am: 0204e4a08e am: 083df1ec90 
Change-Id: I8823618f688d781f5a96549da695b45b0f561878
 2020-01-09 00:19:20 +00:00
Meng Wang
0204e4a08e Merge "PersistableBundle: writeToStream/readFromStream" 2020-01-08 23:47:40 +00:00
Automerger Merge Worker
1a7bc730ee Merge "Add API surface for ConnectivityDiagnostics API." am: afa0f1756e am: eb3bae3d11 
Change-Id: I762ac90f485af3c31afadb249f28363f5a34713f
 2020-01-08 22:44:10 +00:00
Philip P. Moltmann
06b07e9e25 (Backport) Pipe through featureId from caller to permission checks in telephony 
code

Test: atest FrameworksTelephonyTests CtsAppOpsTestCases
Bug: 136595429
Fixes: 146350559
Change-Id: Ie58007cf2a4e4a39cdfd72822150efce71dfbe84
Merged-In: I7ef41e8961e48d40e5685c4a521e83cb20953e48
 2020-01-08 14:16:54 -08:00
evitayan
e22e47f48e Allow mainline IPsec(IKE) to statically include @PolicyDirection 
@PolicyDirection was hidden API defined in IpSecManager and
mainline module IPsec(IKE) needs to depend on it.

To remove this hidden API dependency, this commit:
- Moves definition of @PolicyDirection to a separate class
- Creates sharing filegroup framework-ike-shared-srcs for mainline
  IKE and include PolicyDirection.java

Bug: 146360859
Test: build, flash, boot
Test: atest FrameworksIkeTests
Change-Id: Ic6d7c06d4b92e16a9a65430365c9acc73932147b
 2020-01-08 13:53:14 -08:00
Cody Kesting
afa0f1756e Merge "Add API surface for ConnectivityDiagnostics API." 2020-01-08 21:53:14 +00:00
Meng Wang
2536134b12 PersistableBundle: writeToStream/readFromStream 
Bug: 143911192
Test: manual sanity test
Change-Id: I208487d572c8148f28fac3307873dfdc90996ae1
 2020-01-08 13:44:15 -08:00
Automerger Merge Worker
e219088375 Merge "Add setDisabledForSimNetworkLock to StatusBarManager" am: f428f58080 am: 33d3e85975 
Change-Id: Id3ea80c30e149588a6d97f02df978f258dda3495
 2020-01-08 21:13:09 +00:00
Hall Liu
f428f58080 Merge "Add setDisabledForSimNetworkLock to StatusBarManager" 2020-01-08 20:54:48 +00:00
Automerger Merge Worker
7311ee7976 Add test for OverrideValidatorImpl am: 1828d218d6 am: 261d85b7ce 
Change-Id: I85702ddaa1c801e8078a6e25d2457af264e778ed
 2020-01-08 18:54:19 +00:00
Automerger Merge Worker
f4115dd50f Enforce overriding methods for IPlatformCompat am: 465b214383 am: ed7fc22f27 
Change-Id: Id4eafc4f2700b0c7e4578471059204dbc756fdd9
 2020-01-08 18:54:13 +00:00
Andrei Onea
261d85b7ce Add test for OverrideValidatorImpl 
am: 1828d218d6

Change-Id: I8a07c6c7542db7b7a2654f45aaaa39d452101605
 2020-01-08 10:48:02 -08:00
Andrei Onea
ed7fc22f27 Enforce overriding methods for IPlatformCompat 
am: 465b214383

Change-Id: I2f6ff12c492eaf9cc9b8852b0d2b12facb622596
 2020-01-08 10:47:55 -08:00
Automerger Merge Worker
0d962baeea Merge changes from topics "vab_allocate", "vab_wait" am: d0c62b9dab am: dbdfc27520 
Change-Id: I2e6c97a2340b55dc8795767706c15588da1048f8
 2020-01-08 18:44:43 +00:00
Andrei-Valentin Onea
e7194bfdfc Merge changes from topic "fix-policy" 
* changes:
  Refactor CompatConfigTest and PlatformCompatTest
  Add test for OverrideValidatorImpl
  Enforce overriding methods for IPlatformCompat
 2020-01-08 18:42:44 +00:00
Yifan Hong
d0c62b9dab Merge changes from topics "vab_allocate", "vab_wait" 
* changes:
  Use @ErrorCode for UpdateEngineCallback
  Add @ErrorCode annotation to UpdateEngine APIs
  Add UpdateEngine.cleanupSuccessfulUpdate
  Add UpdateEngine.allocateSpace
 2020-01-08 18:37:16 +00:00
Xin Li
45fa8ce95e Merge "DO NOT MERGE - Merge January 2020 Security Release into master" 2020-01-08 17:39:17 +00:00
Automerger Merge Worker
59d58f5cae Merge "Use new UnsupportedAppUsage annotation." am: 9395887931 am: 8081ee1b35 
Change-Id: I330594303664e66571a460fdb1a5ab6cb8e5e273
 2020-01-08 17:14:42 +00:00
Artur Satayev
8081ee1b35 Merge "Use new UnsupportedAppUsage annotation." 
am: 9395887931

Change-Id: If7c0987b098608972ea743649561f5b803ea8d3c
 2020-01-08 08:55:00 -08:00