Merge "Removal of usage of hidden APIs"
This commit is contained in:
@@ -29,7 +29,6 @@ import android.telephony.TelephonyManager;
|
|||||||
import android.telephony.euicc.DownloadableSubscription;
|
import android.telephony.euicc.DownloadableSubscription;
|
||||||
import android.telephony.euicc.EuiccInfo;
|
import android.telephony.euicc.EuiccInfo;
|
||||||
import android.telephony.euicc.EuiccManager.OtaStatus;
|
import android.telephony.euicc.EuiccManager.OtaStatus;
|
||||||
import android.util.ArraySet;
|
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import java.lang.annotation.Retention;
|
import java.lang.annotation.Retention;
|
||||||
@@ -251,18 +250,6 @@ public abstract class EuiccService extends Service {
|
|||||||
/** Start of implementation-specific error results. */
|
/** Start of implementation-specific error results. */
|
||||||
public static final int RESULT_FIRST_USER = 1;
|
public static final int RESULT_FIRST_USER = 1;
|
||||||
|
|
||||||
/**
|
|
||||||
* List of all valid resolution actions for validation purposes.
|
|
||||||
* @hide
|
|
||||||
*/
|
|
||||||
public static final ArraySet<String> RESOLUTION_ACTIONS;
|
|
||||||
static {
|
|
||||||
RESOLUTION_ACTIONS = new ArraySet<>();
|
|
||||||
RESOLUTION_ACTIONS.add(EuiccService.ACTION_RESOLVE_DEACTIVATE_SIM);
|
|
||||||
RESOLUTION_ACTIONS.add(EuiccService.ACTION_RESOLVE_NO_PRIVILEGES);
|
|
||||||
RESOLUTION_ACTIONS.add(EuiccService.ACTION_RESOLVE_RESOLVABLE_ERRORS);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Boolean extra for resolution actions indicating whether the user granted consent.
|
* Boolean extra for resolution actions indicating whether the user granted consent.
|
||||||
* This is used and set by the implementation and used in {@code EuiccOperation}.
|
* This is used and set by the implementation and used in {@code EuiccOperation}.
|
||||||
|
|||||||
Reference in New Issue
Block a user