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

Merge "Allow privileged carrier app to update subscription nickname."

Browse Source 
am: 81801283e3

Change-Id: Ic8266c3cad813a21b2ef8b34c1a6825f5f3c231c
This commit is contained in:
Holly Jiuyu Sun
2019-01-15 14:26:40 -08:00
committed by android-build-merger
parent e112ed78d5 81801283e3
commit a5972ee708
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -43432,6 +43432,7 @@ package android.telephony.euicc {
method public boolean isEnabled(); method public boolean isEnabled();
method public void startResolutionActivity(android.app.Activity, int, android.content.Intent, android.app.PendingIntent) throws android.content.IntentSender.SendIntentException; method public void startResolutionActivity(android.app.Activity, int, android.content.Intent, android.app.PendingIntent) throws android.content.IntentSender.SendIntentException;
method public void switchToSubscription(int, android.app.PendingIntent); method public void switchToSubscription(int, android.app.PendingIntent);
method public void updateSubscriptionNickname(int, java.lang.String, android.app.PendingIntent);
field public static final java.lang.String ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS = "android.telephony.euicc.action.MANAGE_EMBEDDED_SUBSCRIPTIONS"; field public static final java.lang.String ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS = "android.telephony.euicc.action.MANAGE_EMBEDDED_SUBSCRIPTIONS";
field public static final java.lang.String ACTION_NOTIFY_CARRIER_SETUP_INCOMPLETE = "android.telephony.euicc.action.NOTIFY_CARRIER_SETUP_INCOMPLETE"; field public static final java.lang.String ACTION_NOTIFY_CARRIER_SETUP_INCOMPLETE = "android.telephony.euicc.action.NOTIFY_CARRIER_SETUP_INCOMPLETE";
field public static final int EMBEDDED_SUBSCRIPTION_RESULT_ERROR = 2; // 0x2 field public static final int EMBEDDED_SUBSCRIPTION_RESULT_ERROR = 2; // 0x2

9
telephony/java/android/telephony/euicc/EuiccManager.java
View File

@@ -546,14 +546,13 @@ public class EuiccManager {
/** /**
* Update the nickname for the given subscription. * Update the nickname for the given subscription.
* *
* <p>Requires that the calling app has the * <p>Requires that the calling app has carrier privileges according to the metadata of the
* {@link android.Manifest.permission#WRITE_EMBEDDED_SUBSCRIPTIONS} permission. This is for * profile to be updated, or the
* internal system use only. * {@code android.Manifest.permission#WRITE_EMBEDDED_SUBSCRIPTIONS} permission.
* *
* @param subscriptionId the ID of the subscription to update. * @param subscriptionId the ID of the subscription to update.
* @param nickname the new nickname to apply. * @param nickname the new nickname to apply.
* @param callbackIntent a PendingIntent to launch when the operation completes. * @param callbackIntent a PendingIntent to launch when the operation completes.
* @hide
*/ */
@RequiresPermission(Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) @RequiresPermission(Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS)
public void updateSubscriptionNickname( public void updateSubscriptionNickname(
@@ -564,7 +563,7 @@ public class EuiccManager {
} }
try { try {
getIEuiccController().updateSubscriptionNickname( getIEuiccController().updateSubscriptionNickname(
subscriptionId, nickname, callbackIntent); subscriptionId, nickname, mContext.getOpPackageName(), callbackIntent);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }

2
telephony/java/com/android/internal/telephony/euicc/IEuiccController.aidl
View File

@@ -39,7 +39,7 @@ interface IEuiccController {
oneway void switchToSubscription(int subscriptionId, String callingPackage, oneway void switchToSubscription(int subscriptionId, String callingPackage,
in PendingIntent callbackIntent); in PendingIntent callbackIntent);
oneway void updateSubscriptionNickname(int subscriptionId, String nickname, oneway void updateSubscriptionNickname(int subscriptionId, String nickname,
in PendingIntent callbackIntent); String callingPackage, in PendingIntent callbackIntent);
oneway void eraseSubscriptions(in PendingIntent callbackIntent); oneway void eraseSubscriptions(in PendingIntent callbackIntent);
oneway void retainSubscriptionsForFactoryReset(in PendingIntent callbackIntent); oneway void retainSubscriptionsForFactoryReset(in PendingIntent callbackIntent);
} }