Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Allow Privileged apps to read prefered data state" am: 17ed973b1b am: 8458831e6f am: 9e0c3516bf"

Browse Source
This commit is contained in:
Android Build Merger (Role)
2019-02-05 06:51:35 +00:00
committed by Android (Google) Code Review
parent 004629af93 6a3c44b130
commit da5f5c8535
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -44136,7 +44136,7 @@ package android.telephony {
}
public final class AvailableNetworkInfo implements android.os.Parcelable {
ctor public AvailableNetworkInfo(int, int, java.util.ArrayList<java.lang.String>);
ctor public AvailableNetworkInfo(int, int, java.util.List<java.lang.String>);
method public int describeContents();
method public java.util.List<java.lang.String> getMccMncs();
method public int getPriority();
@@ -45098,7 +45098,7 @@ package android.telephony {
method public int getNetworkType();
method public int getPhoneCount();
method public int getPhoneType();
method public int getPreferredOpportunisticDataSubscription();
method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PHONE_STATE}) public int getPreferredOpportunisticDataSubscription();
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telephony.ServiceState getServiceState();
method @Nullable public android.telephony.SignalStrength getSignalStrength();
method public int getSimCarrierId();

2
telephony/java/android/telephony/AvailableNetworkInfo.java
View File

@@ -114,7 +114,7 @@ public final class AvailableNetworkInfo implements Parcelable {
in.readStringList(mMccMncs);
}
public AvailableNetworkInfo(int subId, int priority, ArrayList<String> mccMncs) {
public AvailableNetworkInfo(int subId, int priority, List<String> mccMncs) {
mSubId = subId;
mPriority = priority;
mMccMncs = new ArrayList<String>(mccMncs);

11
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -9700,10 +9700,10 @@ public class TelephonyManager {
*
* <p>
* Requires Permission:
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
* {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE READ_PRIVILEGED_PHONE_STATE}
* @hide
*/
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public boolean isOpportunisticNetworkEnabled() {
String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
boolean isEnabled = false;
@@ -10091,12 +10091,17 @@ public class TelephonyManager {
* Get preferred opportunistic data subscription Id
*
* <p>Requires that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}),
* or has permission {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}.
* or has either READ_PRIVILEGED_PHONE_STATE
* or {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} permission.
* @return subId preferred opportunistic subscription id or
* {@link SubscriptionManager#DEFAULT_SUBSCRIPTION_ID} if there are no preferred
* subscription id
*
*/
@RequiresPermission(anyOf = {
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
android.Manifest.permission.READ_PHONE_STATE
})
public int getPreferredOpportunisticDataSubscription() {
String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;