Test: I solemnly swear I tested this conflict resolution.
Bug: 109809543
Change-Id: If49f6adecb3cae911ba758753679565f9f5d317b
Merged-In: I9f750a72edfc282c80f7547647bcddaf2da51d9b
See the other CL on the same topic for the details
Bug: 109809543
Test: See the other CL
Change-Id: I9f750a72edfc282c80f7547647bcddaf2da51d9b
Merged-In: I9f750a72edfc282c80f7547647bcddaf2da51d9b
Test: Simulated and verified the new intend is used
Bug: 118658558
Bug: 115990430
Merged-in: I07a58d0fe1c34106b3da85d1dfd4576b40da4bd5
Change-Id: I07a58d0fe1c34106b3da85d1dfd4576b40da4bd5
Test: manual (verified from logcat that intent is broadcast)
Bug: 115990430
Merged-in: I660cf2d04a1b57a58c8cefd212e5f8d73b329890
Change-Id: I660cf2d04a1b57a58c8cefd212e5f8d73b329890
(cherry picked from commit 8c1c45a710)
Based on some analysis, these fields/methods are likely false positives.
Set maxTargetSdk=P so that any apps using them are required to migrate off
them in future. See the bug for more details.
Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.
Bug: 115609023
Test: m
Merged-In: I719b5c94e5b1f4fa562dd5d655953422958ad37e
Change-Id: I719b5c94e5b1f4fa562dd5d655953422958ad37e
(cherry picked from commit 8c854f86a4)
1. migrate set/get roamingType from ServiceState to
NetworkRegState.set/get roamingType
2. migrate set/get roamingStateFromRegstate from ServiceState
to NetworkRegState.regState
3. new System API for neworkRegistration.isRoaming().
Bug: 116127096
Test: ServiceStateTest, ServiceStateProviderTest
Change-Id: Ib89744089c98713819c8d313240d629ddb77d0bf
For packages:
android.providers.settings
android.provider
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug: 110868826
Test: m
Change-Id: I993adf36dc31a5e224e88217c9e8dc140b6ba880
Merged-In: I3865ac184fcb6f52c6bfab9729611b065b27722e
Rename getAndroidCarrierIdForSubscription to getSimCarrierId.
Drop prefix "Android" as Android is implicit everywhere.
Rename carrierName to CarrierIdName to imply correlation between
these two APIs. This also helps to differentiate from another API
getSimOperatorName.
Bug: 71584605
Test: build
Change-Id: Iba4b1c21522741b8c11836a4c39004064736b4c6
Bug: 73953797
Test: unit test
Change-Id: Id89c9100e8963a3cb890ebec347e4aabcd5fd4b8
(cherry picked from commit 4281d0ff57)
Merged-in: Id89c9100e8963a3cb890ebec347e4aabcd5fd4b8
restructure CarrierIdProvider into two tables
1. All - a private table which stores a complete mapping of all carriers
2. Current - a public table only stores the carrier identification of the
current active subs. require no permission to query.
expose the content url to public so that apps could be
notified on carrier identity change either on background or foreground.
Bug: 72571475
Test: runtest --path CarrierIdProviderTest.java
Test: Manual
Change-Id: If2a20288e63d25343f5bb582b35564d769a4e13b
