Make hidden subscription apis as system
Make following APIs as system SubscriptionInfo;->isGroupDisabled TelephonyManager;->isModemEnabledForSlot TelephonyManager;->setOpportunisticNetworkState Add a new public API SubscriptionManager;->getActiveAndHiddenSubscriptionInfoList As they need to be accessed by system application to configure the opportunistic subscripion info Bug: 141122805 Test: verified that CBRS app is still working fine Change-Id: Idf1520911272ba4b7c1f15671d6221d99ba0ab37
This commit is contained in:
@@ -45231,6 +45231,7 @@ package android.telephony {
|
|||||||
method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.os.ParcelUuid createSubscriptionGroup(@NonNull java.util.List<java.lang.Integer>);
|
method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.os.ParcelUuid createSubscriptionGroup(@NonNull java.util.List<java.lang.Integer>);
|
||||||
method @Deprecated public static android.telephony.SubscriptionManager from(android.content.Context);
|
method @Deprecated public static android.telephony.SubscriptionManager from(android.content.Context);
|
||||||
method public java.util.List<android.telephony.SubscriptionInfo> getAccessibleSubscriptionInfoList();
|
method public java.util.List<android.telephony.SubscriptionInfo> getAccessibleSubscriptionInfoList();
|
||||||
|
method @Nullable public java.util.List<android.telephony.SubscriptionInfo> getActiveAndHiddenSubscriptionInfoList();
|
||||||
method public static int getActiveDataSubscriptionId();
|
method public static int getActiveDataSubscriptionId();
|
||||||
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfo(int);
|
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfo(int);
|
||||||
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getActiveSubscriptionInfoCount();
|
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getActiveSubscriptionInfoCount();
|
||||||
|
|||||||
@@ -8484,6 +8484,7 @@ package android.telephony {
|
|||||||
public class SubscriptionInfo implements android.os.Parcelable {
|
public class SubscriptionInfo implements android.os.Parcelable {
|
||||||
method @Nullable public java.util.List<android.telephony.UiccAccessRule> getAccessRules();
|
method @Nullable public java.util.List<android.telephony.UiccAccessRule> getAccessRules();
|
||||||
method public int getProfileClass();
|
method public int getProfileClass();
|
||||||
|
method public boolean isGroupDisabled();
|
||||||
}
|
}
|
||||||
|
|
||||||
public class SubscriptionManager {
|
public class SubscriptionManager {
|
||||||
@@ -8597,7 +8598,9 @@ package android.telephony {
|
|||||||
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int);
|
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int);
|
||||||
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled();
|
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled();
|
||||||
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();
|
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();
|
||||||
|
method public boolean isModemEnabledForSlot(int);
|
||||||
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook();
|
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook();
|
||||||
|
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isOpportunisticNetworkEnabled();
|
||||||
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isPotentialEmergencyNumber(@NonNull String);
|
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isPotentialEmergencyNumber(@NonNull String);
|
||||||
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRadioOn();
|
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRadioOn();
|
||||||
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging();
|
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging();
|
||||||
@@ -8618,6 +8621,7 @@ package android.telephony {
|
|||||||
method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);
|
method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);
|
||||||
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);
|
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);
|
||||||
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultiSimCarrierRestriction(boolean);
|
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultiSimCarrierRestriction(boolean);
|
||||||
|
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunisticNetworkState(boolean);
|
||||||
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmask(long);
|
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmask(long);
|
||||||
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean);
|
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean);
|
||||||
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadioPower(boolean);
|
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadioPower(boolean);
|
||||||
|
|||||||
@@ -654,6 +654,7 @@ public class SubscriptionInfo implements Parcelable {
|
|||||||
* Return whether the subscription's group is disabled.
|
* Return whether the subscription's group is disabled.
|
||||||
* @hide
|
* @hide
|
||||||
*/
|
*/
|
||||||
|
@SystemApi
|
||||||
public boolean isGroupDisabled() {
|
public boolean isGroupDisabled() {
|
||||||
return mIsGroupDisabled;
|
return mIsGroupDisabled;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1283,12 +1283,32 @@ public class SubscriptionManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is similar to {@link #getActiveSubscriptionInfoList()}, but if userVisibleOnly
|
* Get both hidden and visible SubscriptionInfo(s) of the currently active SIM(s).
|
||||||
* is true, it will filter out the hidden subscriptions.
|
* The records will be sorted by {@link SubscriptionInfo#getSimSlotIndex}
|
||||||
|
* then by {@link SubscriptionInfo#getSubscriptionId}.
|
||||||
|
*
|
||||||
|
* <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
|
||||||
|
* or that the calling app has carrier privileges (see
|
||||||
|
* {@link TelephonyManager#hasCarrierPrivileges}). In the latter case, only records accessible
|
||||||
|
* to the calling app are returned.
|
||||||
|
*
|
||||||
|
* @return Sorted list of the currently available {@link SubscriptionInfo}
|
||||||
|
* records on the device.
|
||||||
|
* This is similar to {@link getActiveSubscriptionInfoList} except that it will return
|
||||||
|
* both active and hidden SubscriptionInfos.
|
||||||
*
|
*
|
||||||
* @hide
|
|
||||||
*/
|
*/
|
||||||
public List<SubscriptionInfo> getActiveSubscriptionInfoList(boolean userVisibleOnly) {
|
public @Nullable List<SubscriptionInfo> getActiveAndHiddenSubscriptionInfoList() {
|
||||||
|
return getActiveSubscriptionInfoList(/* userVisibleonly */false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is similar to {@link #getActiveSubscriptionInfoList()}, but if userVisibleOnly
|
||||||
|
* is true, it will filter out the hidden subscriptions.
|
||||||
|
*
|
||||||
|
* @hide
|
||||||
|
*/
|
||||||
|
public @Nullable List<SubscriptionInfo> getActiveSubscriptionInfoList(boolean userVisibleOnly) {
|
||||||
List<SubscriptionInfo> activeList = null;
|
List<SubscriptionInfo> activeList = null;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -10813,6 +10813,7 @@ public class TelephonyManager {
|
|||||||
* @hide
|
* @hide
|
||||||
*/
|
*/
|
||||||
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
|
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
|
||||||
|
@SystemApi
|
||||||
public boolean setOpportunisticNetworkState(boolean enable) {
|
public boolean setOpportunisticNetworkState(boolean enable) {
|
||||||
String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
|
String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
|
||||||
boolean ret = false;
|
boolean ret = false;
|
||||||
@@ -10840,6 +10841,7 @@ public class TelephonyManager {
|
|||||||
* @hide
|
* @hide
|
||||||
*/
|
*/
|
||||||
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
|
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
|
||||||
|
@SystemApi
|
||||||
public boolean isOpportunisticNetworkEnabled() {
|
public boolean isOpportunisticNetworkEnabled() {
|
||||||
String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
|
String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
|
||||||
boolean isEnabled = false;
|
boolean isEnabled = false;
|
||||||
@@ -11477,6 +11479,7 @@ public class TelephonyManager {
|
|||||||
* @param slotIndex which slot it's checking.
|
* @param slotIndex which slot it's checking.
|
||||||
* @hide
|
* @hide
|
||||||
*/
|
*/
|
||||||
|
@SystemApi
|
||||||
public boolean isModemEnabledForSlot(int slotIndex) {
|
public boolean isModemEnabledForSlot(int slotIndex) {
|
||||||
try {
|
try {
|
||||||
ITelephony telephony = getITelephony();
|
ITelephony telephony = getITelephony();
|
||||||
|
|||||||
Reference in New Issue
Block a user