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

Merge changes from topics "15_apis", "set_get_properties"

Browse Source 
* changes:
  Support get/set subscription property
  Added 15 APIs support
This commit is contained in:
Treehugger Robot
2023-03-10 23:24:54 +00:00
committed by Gerrit Code Review
parent 0b476612d2 fbcbce286f
commit a11a12ae1d
2 changed files with 197 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
telephony/common/com/android/internal/telephony/TelephonyPermissions.java
View File

@@ -743,11 +743,23 @@ public final class TelephonyPermissions {
/** /**
* Given a list of permissions, check to see if the caller has at least one of them granted. If * Given a list of permissions, check to see if the caller has at least one of them granted. If
* not, check to see if the caller has carrier privileges. If the caller does not have any of * not, check to see if the caller has carrier privileges. If the caller does not have any of
* these permissions, throw a SecurityException. * these permissions, throw a SecurityException.
*/ */
public static void enforceAnyPermissionGrantedOrCarrierPrivileges(Context context, int subId, public static void enforceAnyPermissionGrantedOrCarrierPrivileges(Context context, int subId,
int uid, String message, String... permissions) { int uid, String message, String... permissions) {
enforceAnyPermissionGrantedOrCarrierPrivileges(
context, subId, uid, false, message, permissions);
}
/**
* Given a list of permissions, check to see if the caller has at least one of them granted. If
* not, check to see if the caller has carrier privileges on the specified subscription (or any
* subscription if {@code allowCarrierPrivilegeOnAnySub} is {@code true}. If the caller does not
* have any of these permissions, throw a {@link SecurityException}.
*/
public static void enforceAnyPermissionGrantedOrCarrierPrivileges(Context context, int subId,
int uid, boolean allowCarrierPrivilegeOnAnySub, String message, String... permissions) {
if (permissions.length == 0) return; if (permissions.length == 0) return;
boolean isGranted = false; boolean isGranted = false;
for (String perm : permissions) { for (String perm : permissions) {
@@ -758,7 +770,12 @@ public final class TelephonyPermissions {
} }
if (isGranted) return; if (isGranted) return;
if (checkCarrierPrivilegeForSubId(context, subId)) return;
if (allowCarrierPrivilegeOnAnySub) {
if (checkCarrierPrivilegeForAnySubId(context, Binder.getCallingUid())) return;
} else {
if (checkCarrierPrivilegeForSubId(context, subId)) return;
}
StringBuilder b = new StringBuilder(message); StringBuilder b = new StringBuilder(message);
b.append(": Neither user "); b.append(": Neither user ");
@@ -769,7 +786,8 @@ public final class TelephonyPermissions {
b.append(" or "); b.append(" or ");
b.append(permissions[i]); b.append(permissions[i]);
} }
b.append(" or carrier privileges"); b.append(" or carrier privileges. subId=" + subId + ", allowCarrierPrivilegeOnAnySub="
+ allowCarrierPrivilegeOnAnySub);
throw new SecurityException(b.toString()); throw new SecurityException(b.toString());
} }

280
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -58,6 +58,7 @@ import android.os.UserHandle;
import android.provider.Telephony.SimInfo; import android.provider.Telephony.SimInfo;
import android.telephony.euicc.EuiccManager; import android.telephony.euicc.EuiccManager;
import android.telephony.ims.ImsMmTelManager; import android.telephony.ims.ImsMmTelManager;
import android.text.TextUtils;
import android.util.Base64; import android.util.Base64;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
@@ -731,6 +732,15 @@ public class SubscriptionManager {
/** Indicates that data roaming is disabled for a subscription */ /** Indicates that data roaming is disabled for a subscription */
public static final int DATA_ROAMING_DISABLE = SimInfo.DATA_ROAMING_DISABLE; public static final int DATA_ROAMING_DISABLE = SimInfo.DATA_ROAMING_DISABLE;
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = {"DATA_ROAMING_"},
value = {
DATA_ROAMING_ENABLE,
DATA_ROAMING_DISABLE
})
public @interface DataRoamingMode {}
/** /**
* TelephonyProvider column name for subscription carrier id. * TelephonyProvider column name for subscription carrier id.
* @see TelephonyManager#getSimCarrierId() * @see TelephonyManager#getSimCarrierId()
@@ -2582,17 +2592,27 @@ public class SubscriptionManager {
} }
/** /**
* Store properties associated with SubscriptionInfo in database * Set a field in the subscription database. Note not all fields are supported.
* @param subId Subscription Id of Subscription *
* @param propKey Column name in database associated with SubscriptionInfo * @param subscriptionId Subscription Id of Subscription.
* @param propValue Value to store in DB for particular subId & column name * @param columnName Column name in the database. Note not all fields are supported.
* @param value Value to store in the database.
*
* @throws IllegalArgumentException if {@code subscriptionId} is invalid, or the field is not
* exposed.
* @throws SecurityException if callers do not hold the required permission.
*
* @see android.provider.Telephony.SimInfo for all the columns.
*
* @hide * @hide
*/ */
public static void setSubscriptionProperty(int subId, String propKey, String propValue) { @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
public static void setSubscriptionProperty(int subscriptionId, @NonNull String columnName,
@NonNull String value) {
try { try {
ISub iSub = TelephonyManager.getSubscriptionService(); ISub iSub = TelephonyManager.getSubscriptionService();
if (iSub != null) { if (iSub != null) {
iSub.setSubscriptionProperty(subId, propKey, propValue); iSub.setSubscriptionProperty(subscriptionId, columnName, value);
} }
} catch (RemoteException ex) { } catch (RemoteException ex) {
// ignore it // ignore it
@@ -2621,118 +2641,149 @@ public class SubscriptionManager {
} }
/** /**
* Return list of contacts uri corresponding to query result. * Get specific field in string format from the subscription info database.
* @param subId Subscription Id of Subscription *
* @param propKey Column name in SubscriptionInfo database * @param context The calling context.
* @return list of contacts uri to be returned * @param subscriptionId Subscription id of the subscription.
* @param columnName Column name in subscription database.
*
* @return Value in string format associated with {@code subscriptionId} and {@code columnName}
* from the database.
*
* @throws IllegalArgumentException if {@code subscriptionId} is invalid, or the field is not
* exposed.
*
* @see android.provider.Telephony.SimInfo for all the columns.
*
* @hide * @hide
*/ */
private static List<Uri> getContactsFromSubscriptionProperty(int subId, String propKey, @NonNull
Context context) { @RequiresPermission(anyOf = {
String result = getSubscriptionProperty(subId, propKey, context); Manifest.permission.READ_PHONE_STATE,
if (result != null) { Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
try { "carrier privileges",
byte[] b = Base64.decode(result, Base64.DEFAULT); })
ByteArrayInputStream bis = new ByteArrayInputStream(b); private static String getStringSubscriptionProperty(@NonNull Context context,
ObjectInputStream ois = new ObjectInputStream(bis); int subscriptionId, @NonNull String columnName) {
List<String> contacts = ArrayList.class.cast(ois.readObject());
List<Uri> uris = new ArrayList<>();
for (String contact : contacts) {
uris.add(Uri.parse(contact));
}
return uris;
} catch (IOException e) {
logd("getContactsFromSubscriptionProperty IO exception");
} catch (ClassNotFoundException e) {
logd("getContactsFromSubscriptionProperty ClassNotFound exception");
}
}
return new ArrayList<>();
}
/**
* Store properties associated with SubscriptionInfo in database
* @param subId Subscription Id of Subscription
* @param propKey Column name in SubscriptionInfo database
* @return Value associated with subId and propKey column in database
* @hide
*/
private static String getSubscriptionProperty(int subId, String propKey,
Context context) {
String resultValue = null; String resultValue = null;
try { try {
ISub iSub = TelephonyManager.getSubscriptionService(); ISub iSub = TelephonyManager.getSubscriptionService();
if (iSub != null) { if (iSub != null) {
resultValue = iSub.getSubscriptionProperty(subId, propKey, resultValue = iSub.getSubscriptionProperty(subscriptionId, columnName,
context.getOpPackageName(), context.getAttributionTag()); context.getOpPackageName(), context.getAttributionTag());
} }
} catch (RemoteException ex) { } catch (RemoteException ex) {
// ignore it // ignore it
} }
return resultValue; return TextUtils.emptyIfNull(resultValue);
} }
/** /**
* Returns boolean value corresponding to query result. * Get specific field in {@code boolean} format from the subscription info database.
* @param subId Subscription Id of Subscription *
* @param propKey Column name in SubscriptionInfo database * @param subscriptionId Subscription id of the subscription.
* @param defValue Default boolean value to be returned * @param columnName Column name in subscription database.
* @return boolean result value to be returned * @param defaultValue Default value in case not found or error.
* @param context The calling context.
*
* @return Value in {@code boolean} format associated with {@code subscriptionId} and
* {@code columnName} from the database, or {@code defaultValue} if not found or error.
*
* @throws IllegalArgumentException if {@code subscriptionId} is invalid, or the field is not
* exposed.
*
* @see android.provider.Telephony.SimInfo for all the columns.
*
* @hide * @hide
*/ */
public static boolean getBooleanSubscriptionProperty(int subId, String propKey, @RequiresPermission(anyOf = {
boolean defValue, Context context) { Manifest.permission.READ_PHONE_STATE,
String result = getSubscriptionProperty(subId, propKey, context); Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
if (result != null) { "carrier privileges",
})
public static boolean getBooleanSubscriptionProperty(int subscriptionId,
@NonNull String columnName, boolean defaultValue, @NonNull Context context) {
String result = getStringSubscriptionProperty(context, subscriptionId, columnName);
if (!result.isEmpty()) {
try { try {
return Integer.parseInt(result) == 1; return Integer.parseInt(result) == 1;
} catch (NumberFormatException err) { } catch (NumberFormatException err) {
logd("getBooleanSubscriptionProperty NumberFormat exception"); logd("getBooleanSubscriptionProperty NumberFormat exception");
} }
} }
return defValue; return defaultValue;
} }
/** /**
* Returns integer value corresponding to query result. * Get specific field in {@code integer} format from the subscription info database.
* @param subId Subscription Id of Subscription *
* @param propKey Column name in SubscriptionInfo database * @param subscriptionId Subscription id of the subscription.
* @param defValue Default integer value to be returned * @param columnName Column name in subscription database.
* @return integer result value to be returned * @param defaultValue Default value in case not found or error.
* @param context The calling context.
*
* @return Value in {@code integer} format associated with {@code subscriptionId} and
* {@code columnName} from the database, or {@code defaultValue} if not found or error.
*
* @throws IllegalArgumentException if {@code subscriptionId} is invalid, or the field is not
* exposed.
*
* @see android.provider.Telephony.SimInfo for all the columns.
*
* @hide * @hide
*/ */
public static int getIntegerSubscriptionProperty(int subId, String propKey, int defValue, @RequiresPermission(anyOf = {
Context context) { Manifest.permission.READ_PHONE_STATE,
String result = getSubscriptionProperty(subId, propKey, context); Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
if (result != null) { "carrier privileges",
})
public static int getIntegerSubscriptionProperty(int subscriptionId, @NonNull String columnName,
int defaultValue, @NonNull Context context) {
String result = getStringSubscriptionProperty(context, subscriptionId, columnName);
if (!result.isEmpty()) {
try { try {
return Integer.parseInt(result); return Integer.parseInt(result);
} catch (NumberFormatException err) { } catch (NumberFormatException err) {
logd("getIntegerSubscriptionProperty NumberFormat exception"); logd("getIntegerSubscriptionProperty NumberFormat exception");
} }
} }
return defValue; return defaultValue;
} }
/** /**
* Returns long value corresponding to query result. * Get specific field in {@code long} format from the subscription info database.
* @param subId Subscription Id of Subscription *
* @param propKey Column name in SubscriptionInfo database * @param subscriptionId Subscription id of the subscription.
* @param defValue Default long value to be returned * @param columnName Column name in subscription database.
* @return long result value to be returned * @param defaultValue Default value in case not found or error.
* @param context The calling context.
*
* @return Value in {@code long} format associated with {@code subscriptionId} and
* {@code columnName} from the database, or {@code defaultValue} if not found or error.
*
* @throws IllegalArgumentException if {@code subscriptionId} is invalid, or the field is not
* exposed.
*
* @see android.provider.Telephony.SimInfo for all the columns.
*
* @hide * @hide
*/ */
public static long getLongSubscriptionProperty(int subId, String propKey, long defValue, @RequiresPermission(anyOf = {
Context context) { Manifest.permission.READ_PHONE_STATE,
String result = getSubscriptionProperty(subId, propKey, context); Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
if (result != null) { "carrier privileges",
})
public static long getLongSubscriptionProperty(int subscriptionId, @NonNull String columnName,
long defaultValue, @NonNull Context context) {
String result = getStringSubscriptionProperty(context, subscriptionId, columnName);
if (!result.isEmpty()) {
try { try {
return Long.parseLong(result); return Long.parseLong(result);
} catch (NumberFormatException err) { } catch (NumberFormatException err) {
logd("getLongSubscriptionProperty NumberFormat exception"); logd("getLongSubscriptionProperty NumberFormat exception");
} }
} }
return defValue; return defaultValue;
} }
/** /**
@@ -3460,7 +3511,6 @@ public class SubscriptionManager {
* @param groupUuid of which list of subInfo will be returned. * @param groupUuid of which list of subInfo will be returned.
* @return list of subscriptionInfo that belong to the same group, including the given * @return list of subscriptionInfo that belong to the same group, including the given
* subscription itself. It will return an empty list if no subscription belongs to the group. * subscription itself. It will return an empty list if no subscription belongs to the group.
*
*/ */
@SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges
@RequiresPermission(Manifest.permission.READ_PHONE_STATE) @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
@@ -3500,7 +3550,8 @@ public class SubscriptionManager {
* want to see their own hidden subscriptions. * want to see their own hidden subscriptions.
* *
* @param info the subscriptionInfo to check against. * @param info the subscriptionInfo to check against.
* @return true if this subscription should be visible to the API caller. *
* @return {@code true} if this subscription should be visible to the API caller.
* *
* @hide * @hide
*/ */
@@ -3573,9 +3624,9 @@ public class SubscriptionManager {
* <p> * <p>
* Permissions android.Manifest.permission.MODIFY_PHONE_STATE is required * Permissions android.Manifest.permission.MODIFY_PHONE_STATE is required
* *
* @param subscriptionId Subscription to be enabled or disabled. It could be a eSIM or pSIM
* subscription.
* @param enable whether user is turning it on or off. * @param enable whether user is turning it on or off.
* @param subscriptionId Subscription to be enabled or disabled.
* It could be a eSIM or pSIM subscription.
* *
* @return whether the operation is successful. * @return whether the operation is successful.
* *
@@ -3608,8 +3659,6 @@ public class SubscriptionManager {
* available from SubscriptionInfo.areUiccApplicationsEnabled() will be updated * available from SubscriptionInfo.areUiccApplicationsEnabled() will be updated
* immediately.) * immediately.)
* *
* Permissions android.Manifest.permission.MODIFY_PHONE_STATE is required
*
* @param subscriptionId which subscription to operate on. * @param subscriptionId which subscription to operate on.
* @param enabled whether uicc applications are enabled or disabled. * @param enabled whether uicc applications are enabled or disabled.
* @hide * @hide
@@ -3642,8 +3691,6 @@ public class SubscriptionManager {
* It provides whether a physical SIM card can be disabled without taking it out, which is done * It provides whether a physical SIM card can be disabled without taking it out, which is done
* via {@link #setSubscriptionEnabled(int, boolean)} API. * via {@link #setSubscriptionEnabled(int, boolean)} API.
* *
* Requires Permission: READ_PRIVILEGED_PHONE_STATE.
*
* @return whether can disable subscriptions on physical SIMs. * @return whether can disable subscriptions on physical SIMs.
* *
* @hide * @hide
@@ -3671,10 +3718,11 @@ public class SubscriptionManager {
} }
/** /**
* DO NOT USE. * Check if the subscription is currently active in any slot.
* This API is designed for features that are not finished at this point. Do not call this API. *
* @param subscriptionId The subscription id.
*
* @hide * @hide
* TODO b/135547512: further clean up
*/ */
@SystemApi @SystemApi
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
@@ -3692,11 +3740,14 @@ public class SubscriptionManager {
} }
/** /**
* Set the device to device status sharing user preference for a subscription ID. The setting * Set the device to device status sharing user preference for a subscription id. The setting
* app uses this method to indicate with whom they wish to share device to device status * app uses this method to indicate with whom they wish to share device to device status
* information. * information.
* @param sharing the status sharing preference *
* @param subscriptionId the unique Subscription ID in database * @param subscriptionId The subscription id.
* @param sharing The status sharing preference.
*
* @throws SecurityException if the caller doesn't have permissions required.
*/ */
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
public void setDeviceToDeviceStatusSharingPreference(int subscriptionId, public void setDeviceToDeviceStatusSharingPreference(int subscriptionId,
@@ -3713,6 +3764,8 @@ public class SubscriptionManager {
* Returns the user-chosen device to device status sharing preference * Returns the user-chosen device to device status sharing preference
* @param subscriptionId Subscription id of subscription * @param subscriptionId Subscription id of subscription
* @return The device to device status sharing preference * @return The device to device status sharing preference
*
* @throws SecurityException if the caller doesn't have permissions required.
*/ */
public @DeviceToDeviceStatusSharingPreference int getDeviceToDeviceStatusSharingPreference( public @DeviceToDeviceStatusSharingPreference int getDeviceToDeviceStatusSharingPreference(
int subscriptionId) { int subscriptionId) {
@@ -3724,11 +3777,14 @@ public class SubscriptionManager {
} }
/** /**
* Set the list of contacts that allow device to device status sharing for a subscription ID. * Set the list of contacts that allow device to device status sharing for a subscription id.
* The setting app uses this method to indicate with whom they wish to share device to device * The setting app uses this method to indicate with whom they wish to share device to device
* status information. * status information.
* @param contacts The list of contacts that allow device to device status sharing *
* @param subscriptionId The unique Subscription ID in database * @param subscriptionId The subscription id.
* @param contacts The list of contacts that allow device to device status sharing.
*
* @throws SecurityException if the caller doesn't have permissions required.
*/ */
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
public void setDeviceToDeviceStatusSharingContacts(int subscriptionId, public void setDeviceToDeviceStatusSharingContacts(int subscriptionId,
@@ -3744,17 +3800,33 @@ public class SubscriptionManager {
} }
/** /**
* Returns the list of contacts that allow device to device status sharing. * Get the list of contacts that allow device to device status sharing.
* @param subscriptionId Subscription id of subscription *
* @return The list of contacts that allow device to device status sharing * @param subscriptionId Subscription id.
*
* @return The list of contacts that allow device to device status sharing.
*/ */
public @NonNull List<Uri> getDeviceToDeviceStatusSharingContacts( public @NonNull List<Uri> getDeviceToDeviceStatusSharingContacts(int subscriptionId) {
int subscriptionId) { String result = getStringSubscriptionProperty(mContext, subscriptionId,
if (VDBG) { D2D_STATUS_SHARING_SELECTED_CONTACTS);
logd("[getDeviceToDeviceStatusSharingContacts] + subId: " + subscriptionId); if (result != null) {
try {
byte[] b = Base64.decode(result, Base64.DEFAULT);
ByteArrayInputStream bis = new ByteArrayInputStream(b);
ObjectInputStream ois = new ObjectInputStream(bis);
List<String> contacts = ArrayList.class.cast(ois.readObject());
List<Uri> uris = new ArrayList<>();
for (String contact : contacts) {
uris.add(Uri.parse(contact));
}
return uris;
} catch (IOException e) {
logd("getDeviceToDeviceStatusSharingContacts IO exception");
} catch (ClassNotFoundException e) {
logd("getDeviceToDeviceStatusSharingContacts ClassNotFound exception");
}
} }
return getContactsFromSubscriptionProperty(subscriptionId, return new ArrayList<>();
D2D_STATUS_SHARING_SELECTED_CONTACTS, mContext);
} }
/** /**
@@ -3809,12 +3881,12 @@ public class SubscriptionManager {
/** /**
* Get active data subscription id. Active data subscription refers to the subscription * Get active data subscription id. Active data subscription refers to the subscription
* currently chosen to provide cellular internet connection to the user. This may be * currently chosen to provide cellular internet connection to the user. This may be
* different from getDefaultDataSubscriptionId(). Eg. Opportunistics data * different from {@link #getDefaultDataSubscriptionId()}.
* *
* See {@link PhoneStateListener#onActiveDataSubscriptionIdChanged(int)} for the details. * @return Active data subscription id if any is chosen, or {@link #INVALID_SUBSCRIPTION_ID} if
* not.
* *
* @return Active data subscription id if any is chosen, or * @see TelephonyCallback.ActiveDataSubscriptionIdListener
* SubscriptionManager.INVALID_SUBSCRIPTION_ID if not.
*/ */
public static int getActiveDataSubscriptionId() { public static int getActiveDataSubscriptionId() {
if (isSubscriptionManagerServiceEnabled()) { if (isSubscriptionManagerServiceEnabled()) {