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

Merge "Pass calling package to resolution UI." into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-27 00:48:33 +00:00
committed by Android (Google) Code Review
parent c4ccefc7fd b4c67ec3c8
commit 776220d029
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/service/euicc/EuiccService.java
View File

@@ -97,6 +97,10 @@ public abstract class EuiccService extends Service {
public static final String ACTION_RESOLVE_NO_PRIVILEGES =
"android.service.euicc.action.RESOLVE_NO_PRIVILEGES";
/** Intent extra set for resolution requests containing the package name of the calling app. */
public static final String EXTRA_RESOLUTION_CALLING_PACKAGE =
"android.service.euicc.extra.RESOLUTION_CALLING_PACKAGE";
/** Result code for a successful operation. */
public static final int RESULT_OK = 0;
/** Result code indicating that an active SIM must be deactivated to perform the operation. */

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

@@ -320,7 +320,8 @@ public class EuiccManager {
return;
}
try {
mController.getDownloadableSubscriptionMetadata(subscription, callbackIntent);
mController.getDownloadableSubscriptionMetadata(
subscription, mContext.getOpPackageName(), callbackIntent);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -349,7 +350,8 @@ public class EuiccManager {
return;
}
try {
mController.getDefaultDownloadableSubscriptionList(callbackIntent);
mController.getDefaultDownloadableSubscriptionList(
mContext.getOpPackageName(), callbackIntent);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}

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

@@ -26,8 +26,9 @@ import android.telephony.euicc.EuiccInfo;
interface IEuiccController {
oneway void continueOperation(in Intent resolutionIntent, in Bundle resolutionExtras);
oneway void getDownloadableSubscriptionMetadata(in DownloadableSubscription subscription,
in PendingIntent callbackIntent);
oneway void getDefaultDownloadableSubscriptionList(in PendingIntent callbackIntent);
String callingPackage, in PendingIntent callbackIntent);
oneway void getDefaultDownloadableSubscriptionList(
String callingPackage, in PendingIntent callbackIntent);
String getEid();
oneway void downloadSubscription(in DownloadableSubscription subscription,
boolean switchAfterDownload, String callingPackage, in PendingIntent callbackIntent);