Commit Graph

30278 Commits

Author SHA1 Message Date
Anthony Stange
ab287edef8 Merge "Revert "Un-expose ACTION_SERVICE_PROVIDERS_UPDATED."" into rvc-dev am: 26d4854185
Change-Id: I075f89895774022841fd339e4170d22d231493ae
2020-03-18 20:34:26 +00:00
Anthony Stange
26d4854185 Merge "Revert "Un-expose ACTION_SERVICE_PROVIDERS_UPDATED."" into rvc-dev 2020-03-18 20:29:24 +00:00
Anthony Stange
c935bac0ae Revert "Un-expose ACTION_SERVICE_PROVIDERS_UPDATED."
This reverts commit 13a8d14fcd.

Reason for revert: Build breakage - b/151854914

Change-Id: I8ea4ac36605c8df92df92a286a8712e40a6944db
2020-03-18 20:26:27 +00:00
Eugene Susla
99d4778585 Merge "Expose OPSTR_AUTO_REVOKE_MANAGED_BY_INSTALLER as @SystemApi" into rvc-dev am: fea313038b
Change-Id: I1ef0801bf8d2ea7258dbea5445a3f3c16e3d21b9
2020-03-18 19:59:04 +00:00
Sarah Chin
4eb9055caa Merge "API review: SubscriptionPlan#getNetworkTypes/setNetworkTypes" into rvc-dev am: 210bccd974
Change-Id: I2c0bede3ca5f77c0af64897215443bb23101ac00
2020-03-18 19:58:10 +00:00
TreeHugger Robot
7a01fc0092 Merge "Un-expose ACTION_SERVICE_PROVIDERS_UPDATED." into rvc-dev am: 8562620d8a
Change-Id: Id0ea0363690d189962b4debbc41c5360d449843e
2020-03-18 19:57:00 +00:00
Cody Kesting
8c78e55488 Change NetworkCapabilities administrator UIDs to be stored as int[]. am: f7ac996fb5
Change-Id: I26343fa85d936aa71dbe983341343fd1d74a7a0a
2020-03-18 19:56:33 +00:00
Eugene Susla
fea313038b Merge "Expose OPSTR_AUTO_REVOKE_MANAGED_BY_INSTALLER as @SystemApi" into rvc-dev 2020-03-18 19:56:09 +00:00
Sarah Chin
210bccd974 Merge "API review: SubscriptionPlan#getNetworkTypes/setNetworkTypes" into rvc-dev 2020-03-18 19:52:26 +00:00
Amit Mahajan
86baf0e5bd Merge changes from topic "Remove telephony protection level" into rvc-dev am: 0ed16d7b4b
Change-Id: If4e18fe057a500863cbd62db7bcd68be05bd0d6d
2020-03-18 19:42:35 +00:00
Cody Kesting
93b97bd690 Merge "Change NetworkCapabilities administrator UIDs to be stored as int[]." into rvc-dev 2020-03-18 19:40:39 +00:00
TreeHugger Robot
8562620d8a Merge "Un-expose ACTION_SERVICE_PROVIDERS_UPDATED." into rvc-dev 2020-03-18 19:31:38 +00:00
Amit Mahajan
0ed16d7b4b Merge changes from topic "Remove telephony protection level" into rvc-dev
* changes:
  Remove telephony protection level.
  Revert "Allowed telephony to bind network service"
  Revert "add telephony role to some permissions needed by telephony module"
2020-03-18 19:22:36 +00:00
Rubin Xu
070d6ce897 Merge "Replace COMMON_CRITERIA_MODE setting with getter API" into rvc-dev am: 243c57f079
Change-Id: I5e8aa9eeaa2c14fe745eca98fa396d017e293507
2020-03-18 18:46:28 +00:00
Rubin Xu
243c57f079 Merge "Replace COMMON_CRITERIA_MODE setting with getter API" into rvc-dev 2020-03-18 18:42:28 +00:00
Yu-Han Yang
644308c8bc Merge "Update inter-signal bias (framework)" into rvc-dev am: f7fcee236e
Change-Id: I61f19ed0b8a7b33959e617ed42a88cc3cebacd8d
2020-03-18 17:55:31 +00:00
Cody Kesting
f7ac996fb5 Change NetworkCapabilities administrator UIDs to be stored as int[].
NetworkCapabilities#mAdministratorUids is used to track the UIDs that
are administrators of the given Network. This value was previously
stored as List<Integer>. However, general Android API Council guidelines
recommend using Arrays for primitive values. In order to be consistent
with the guidelines, updating the field to use an Array.

Bug: 147903575
Test: atest FrameworksNetTests
Change-Id: I2652a5b0f276b8944454af5cb4b1383a3e054cfa
2020-03-18 17:40:24 +00:00
Yu-Han Yang
f7fcee236e Merge "Update inter-signal bias (framework)" into rvc-dev 2020-03-18 17:40:19 +00:00
Rob Carr
8c5bfc186e Merge "SurfacePackage: Add release method" into rvc-dev am: 4841efcfcd
Change-Id: I92a58a351c221d07201ce1f66e51852a7f11cffd
2020-03-18 17:27:54 +00:00
Rob Carr
4841efcfcd Merge "SurfacePackage: Add release method" into rvc-dev 2020-03-18 17:13:32 +00:00
Adrian Roos
7dc8245e84 Merge "WindowInsetsAnimationController: Add state callback and getters" into rvc-dev am: 269b162622
Change-Id: I3a52c334c8acaa907eeaf94c49058578ce56deac
2020-03-18 16:46:20 +00:00
Adrian Roos
269b162622 Merge "WindowInsetsAnimationController: Add state callback and getters" into rvc-dev 2020-03-18 16:43:10 +00:00
Amit Mahajan
20054220be Merge "Revert "Expose ACTION_USER_SWITCHED as system API"" am: 0aa828ab5d am: a558fae2e7
Change-Id: Id8dc85c76023473413be799e079d91b10e67babf
2020-03-18 16:05:51 +00:00
Amit Mahajan
0aa828ab5d Merge "Revert "Expose ACTION_USER_SWITCHED as system API"" 2020-03-18 15:31:08 +00:00
Adrian Roos
5d557edb44 WindowInsetsAnimationController: Add state callback and getters
Adds more comprehensive callbacks and getters for the WindowInsetsAnimationController,
to make it more straight forward to properly use.

Test: atest InsetsControllerTest PendingInsetsControllerTest
Fixes: 151707442
Change-Id: Ida55f609112396c0f6de4c5c4431e0793c2e315e
2020-03-18 12:17:19 +01:00
Zoey Chen
59fd41fbfc Merge "[TelephonyMainline] @hide @SystemApi and revisit them in S. - CarrierColumns" into rvc-dev am: 3312226652
Change-Id: I28b36b7a7bb207dbe5241bf3da73cfc1ce2f5547
2020-03-18 09:56:06 +00:00
Zoey Chen
3312226652 Merge "[TelephonyMainline] @hide @SystemApi and revisit them in S. - CarrierColumns" into rvc-dev 2020-03-18 09:39:12 +00:00
TreeHugger Robot
2e22678e04 Merge "Make parameters parser-implementation independent" into rvc-dev am: 6beb092933
Change-Id: I943ed77404e4cddae4db86ddad20282ce8e86b83
2020-03-18 08:40:24 +00:00
TreeHugger Robot
6beb092933 Merge "Make parameters parser-implementation independent" into rvc-dev 2020-03-18 08:29:38 +00:00
TreeHugger Robot
24466c4924 Merge changes from topic "code_sync_from_aosp" into rvc-dev
* changes:
  Change naming to be more specific
  Update preferred payment related APIs
2020-03-18 08:17:36 +00:00
Roshan Pius
bc3a014a78 Merge "WifiMigration: Add new API's for migrating config store data" into rvc-dev am: 9144141d32
Change-Id: I44e9b7893679755ebd7998ed52cf1ce297fb069d
2020-03-18 05:24:11 +00:00
Roshan Pius
9144141d32 Merge "WifiMigration: Add new API's for migrating config store data" into rvc-dev 2020-03-18 05:20:04 +00:00
Zoey Chen
685fe6f443 Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - IccLock" 2020-03-18 05:15:05 +00:00
Junyu Lai
2c7aa1f5ab Merge "[SP25] Rename functions that add Entry conditionally" 2020-03-18 03:16:41 +00:00
zoey chen
51670b219f [TelephonyMainline] @hide system api since we'll revisit in S. - IccLock
Test: make
Bug: 146983487
Change-Id: Iabc3300e883e2afad6145f9bb1410d0606a35c11
Merged-In: Iabc3300e883e2afad6145f9bb1410d0606a35c11
2020-03-18 10:51:38 +08:00
Roshan Pius
5cdc892562 WifiMigration: Add new API's for migrating config store data
The new API's should be modified by the OEM's to convert their existing
config store file to AOSP format. wifi mainline module will
delete/rename the file after migrating data out of it. Subsequent
invocations of these API's should return null.

Bug: 149418926
Test: Compiles
Change-Id: I9ef0986fd38ea5ba9555c7c4652b90cf2ac2fb91
2020-03-17 19:37:21 -07:00
Amit Mahajan
13a8d14fcd Un-expose ACTION_SERVICE_PROVIDERS_UPDATED.
Will be exposed/reworked on in S.

Test: basic sanity
Bug: 147921202
Change-Id: Iab4974f9cd7cecde1ef6eba35c320101a288b481
2020-03-17 17:41:33 -07:00
junyulai
5a1b9fce65 [SP25] Rename functions that add Entry conditionally
Currently, in NetworkStats, there are many methods to manipulate
the records. However, some methods are similar and ambiguous,
such as addEntry, addValues, setValues, addIfaceValues,
combineValues and combineAllValues.

Thus, properly grouping and renaming methods are necessary.
In this change, for methods that add one record conditionally,
name them addEntry.
  addValues -> addEntry

Test: atest FrameworksNetTests ImsPhoneCallTrackerTest TetheringTests
Fix: 148895143
Change-Id: I9495a198cf247e6c79100f7ac1edcea370b071de
Merged-In: I9495a198cf247e6c79100f7ac1edcea370b071de
(cherry picked from ag/10700816)
2020-03-18 00:29:15 +00:00
Amit Mahajan
5a29b0447b Revert "Expose ACTION_USER_SWITCHED as system API"
This reverts commit ffe0cbe5ca.

Reason for revert: Not needed for now; will be redone in S.

Bug: 148180958
Change-Id: I426e00e1eb79af5b520fc8c59439614459720fa6
2020-03-18 00:19:53 +00:00
Alex Lin
20faafc483 Update EuiccService encodeSmdxSubjectAndReasonCode am: 2c3cc82819 am: 1fb2e3e4fc
Change-Id: I54d7779e0def1eda1b96edb2ae07d4f131e10871
2020-03-17 23:43:27 +00:00
Shuo Qian
23f2dd76fc Merge "Hide several System APIs" into rvc-dev am: 0d4f4e464e
Change-Id: I19bc9b430f84ecea69d4094c5b3a97b4db5bb97c
2020-03-17 23:36:37 +00:00
junyulai
000612686a [SP25] Rename functions that add Entry conditionally am: 32fb2a0e7c
Change-Id: I5f9924cf5b3eccfcdaa6dda991a102b97cebd11a
2020-03-17 23:35:57 +00:00
Alex Lin
1fb2e3e4fc Update EuiccService encodeSmdxSubjectAndReasonCode am: 2c3cc82819
Change-Id: I5a8c7c0e088a01755f67a1f20d1b5a92caadfb66
2020-03-17 23:20:11 +00:00
Alex Lin
d6e6578aab Rename ErrorCode am: 4888d9aca2
Change-Id: Ib3c4e0732359196bd3fdf15a88c71a328d8c85cd
2020-03-17 23:20:02 +00:00
Alex Lin
abba583f62 Add public error codes to Euicc public API am: e61b636a61
Change-Id: I92af20dde36ebdeb00cabaa2558351293ec9c1d1
2020-03-17 23:19:53 +00:00
Junyu Lai
3a6a98f5bb Merge changes from topics "am-ad04c8ad832c4674be35bfc5fe4280dd-rvc-dev", "sp21-api-review-feedback", "sp25-networkstats-rename" into rvc-dev
* changes:
  [SP25] Rename functions that add Entry conditionally
  [SP24] Rename functions that add Entry unconditionally
  [SP23] Address misc API review comment about NetworkStats
  [SP21] Address comments for API council review about aosp/1172143
  [SP20] Check signature permission when accessing network stats provider
2020-03-17 23:11:34 +00:00
Shuo Qian
0d4f4e464e Merge "Hide several System APIs" into rvc-dev 2020-03-17 23:09:31 +00:00
Alex Lin
b375f0bd4a Merge changes from topic "add-error-code"
* changes:
  Update EuiccService encodeSmdxSubjectAndReasonCode
  Rename ErrorCode
  Add public error codes to Euicc public API
2020-03-17 23:01:43 +00:00
Beverly Tai
c6e6e8f9b2 Merge "Give mConsolidatedPolicy a default value" into rvc-dev am: 552d491f63
Change-Id: Id6d9626be3d3c4ae7ad9f87ff495b82021e4c697
2020-03-17 21:40:17 +00:00
Beverly Tai
552d491f63 Merge "Give mConsolidatedPolicy a default value" into rvc-dev 2020-03-17 21:19:25 +00:00