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

Merge "Use getter instead of member for IEuiccController stub."

Browse Source
This commit is contained in:
Holly Jiuyu Sun
2017-12-20 02:49:50 +00:00
committed by Gerrit Code Review
parent 71b25c06a7 c2193d4b24
commit 6991266aa6
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,12 +168,10 @@ public class EuiccManager {
public static final String META_DATA_CARRIER_ICON = "android.telephony.euicc.carriericon"; public static final String META_DATA_CARRIER_ICON = "android.telephony.euicc.carriericon";
private final Context mContext; private final Context mContext;
private final IEuiccController mController;
/** @hide */ /** @hide */
public EuiccManager(Context context) { public EuiccManager(Context context) {
mContext = context; mContext = context;
mController = IEuiccController.Stub.asInterface(ServiceManager.getService("econtroller"));
} }
/** /**
@@ -189,7 +187,7 @@ public class EuiccManager {
public boolean isEnabled() { public boolean isEnabled() {
// In the future, this may reach out to IEuiccController (if non-null) to check any dynamic // In the future, this may reach out to IEuiccController (if non-null) to check any dynamic
// restrictions. // restrictions.
return mController != null; return getIEuiccController() != null;
} }
/** /**
@@ -206,7 +204,7 @@ public class EuiccManager {
return null; return null;
} }
try { try {
return mController.getEid(); return getIEuiccController().getEid();
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }
@@ -232,7 +230,7 @@ public class EuiccManager {
return; return;
} }
try { try {
mController.downloadSubscription(subscription, switchAfterDownload, getIEuiccController().downloadSubscription(subscription, switchAfterDownload,
mContext.getOpPackageName(), callbackIntent); mContext.getOpPackageName(), callbackIntent);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
@@ -296,7 +294,7 @@ public class EuiccManager {
return; return;
} }
try { try {
mController.continueOperation(resolutionIntent, resolutionExtras); getIEuiccController().continueOperation(resolutionIntent, resolutionExtras);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }
@@ -328,7 +326,7 @@ public class EuiccManager {
return; return;
} }
try { try {
mController.getDownloadableSubscriptionMetadata( getIEuiccController().getDownloadableSubscriptionMetadata(
subscription, mContext.getOpPackageName(), callbackIntent); subscription, mContext.getOpPackageName(), callbackIntent);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
@@ -358,7 +356,7 @@ public class EuiccManager {
return; return;
} }
try { try {
mController.getDefaultDownloadableSubscriptionList( getIEuiccController().getDefaultDownloadableSubscriptionList(
mContext.getOpPackageName(), callbackIntent); mContext.getOpPackageName(), callbackIntent);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
@@ -377,7 +375,7 @@ public class EuiccManager {
return null; return null;
} }
try { try {
return mController.getEuiccInfo(); return getIEuiccController().getEuiccInfo();
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }
@@ -402,7 +400,7 @@ public class EuiccManager {
return; return;
} }
try { try {
mController.deleteSubscription( getIEuiccController().deleteSubscription(
subscriptionId, mContext.getOpPackageName(), callbackIntent); subscriptionId, mContext.getOpPackageName(), callbackIntent);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
@@ -429,7 +427,7 @@ public class EuiccManager {
return; return;
} }
try { try {
mController.switchToSubscription( getIEuiccController().switchToSubscription(
subscriptionId, mContext.getOpPackageName(), callbackIntent); subscriptionId, mContext.getOpPackageName(), callbackIntent);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
@@ -455,7 +453,8 @@ public class EuiccManager {
return; return;
} }
try { try {
mController.updateSubscriptionNickname(subscriptionId, nickname, callbackIntent); getIEuiccController().updateSubscriptionNickname(
subscriptionId, nickname, callbackIntent);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }
@@ -477,7 +476,7 @@ public class EuiccManager {
return; return;
} }
try { try {
mController.eraseSubscriptions(callbackIntent); getIEuiccController().eraseSubscriptions(callbackIntent);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }
@@ -507,7 +506,7 @@ public class EuiccManager {
return; return;
} }
try { try {
mController.retainSubscriptionsForFactoryReset(callbackIntent); getIEuiccController().retainSubscriptionsForFactoryReset(callbackIntent);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }
@@ -520,4 +519,8 @@ public class EuiccManager {
// Caller canceled the callback; do nothing. // Caller canceled the callback; do nothing.
} }
} }
private static IEuiccController getIEuiccController() {
return IEuiccController.Stub.asInterface(ServiceManager.getService("econtroller"));
}
} }