Merge "Remove wrapper for EUICCManager" into pi-dev am: 2cb0425ded

am: f97264ce15

Change-Id: I07d3188cbc75e36350bb503d57104907772c48f0

src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java

@@ -17,6 +17,7 @@
 package com.android.settings.deviceinfo.simstatus;
 
 import static android.content.Context.CARRIER_CONFIG_SERVICE;
+import static android.content.Context.EUICC_SERVICE;
 import static android.content.Context.TELEPHONY_SERVICE;
 
 import android.Manifest;
@@ -39,13 +40,13 @@ import android.telephony.SignalStrength;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.telephony.euicc.EuiccManager;
 import android.text.BidiFormatter;
 import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.settings.R;
-import com.android.settings.wrapper.EuiccManagerWrapper;
 import com.android.settingslib.DeviceInfoUtils;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -101,7 +102,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
     private final SubscriptionInfo mSubscriptionInfo;
     private final TelephonyManager mTelephonyManager;
     private final CarrierConfigManager mCarrierConfigManager;
-    private final EuiccManagerWrapper mEuiccManager;
+    private final EuiccManager mEuiccManager;
     private final Resources mRes;
     private final Context mContext;
 
@@ -137,7 +138,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
                 TELEPHONY_SERVICE);
         mCarrierConfigManager = (CarrierConfigManager) mContext.getSystemService(
                 CARRIER_CONFIG_SERVICE);
-        mEuiccManager = new EuiccManagerWrapper(mContext);
+        mEuiccManager = (EuiccManager) mContext.getSystemService(EUICC_SERVICE);
 
         mRes = mContext.getResources();
 

src/com/android/settings/wrapper/EuiccManagerWrapper.java

@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wrapper;
-
-import android.annotation.Nullable;
-import android.content.Context;
-import android.telephony.euicc.EuiccManager;
-
-/**
- * This class replicates a subset of the {@link android.telephony.euicc.EuiccManager}.
- * The interface exists so that we can use a thin wrapper around the EuiccManager in
- * production code and a mock in tests.
- */
-public class EuiccManagerWrapper {
-
-    private final EuiccManager mEuiccManager;
-
-    public EuiccManagerWrapper(Context context) {
-        mEuiccManager = (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);
-    }
-
-    /**
-     * Returns the EID identifying the eUICC hardware.
-     *
-     * <p>Requires that the calling app has carrier privileges on the active subscription on the
-     * eUICC.
-     *
-     * @return the EID. May be null if {@link EuiccManager#isEnabled()} is false or the eUICC is not
-     * ready.
-     */
-    @Nullable
-    public String getEid() {
-        return mEuiccManager.getEid();
-    }
-}