Merge "Refactoring and cleanup"

api/system-current.txt

@@ -38560,7 +38560,6 @@ package android.telephony {
     method public boolean isOffhook();
     method public boolean isRadioOn();
     method public boolean isRinging();
-    method public boolean isSimPinEnabled();
     method public boolean isSmsCapable();
     method public boolean isTtyModeSupported();
     method public boolean isVideoCallingEnabled();

telephony/java/android/telephony/TelephonyManager.java

@@ -3996,19 +3996,6 @@ public class TelephonyManager {
         return false;
     }
 
-    /** @hide */
-    @SystemApi
-    public boolean isSimPinEnabled() {
-        try {
-            ITelephony telephony = getITelephony();
-            if (telephony != null)
-                return telephony.isSimPinEnabled(getOpPackageName());
-        } catch (RemoteException e) {
-            Log.e(TAG, "Error calling ITelephony#isSimPinEnabled", e);
-        }
-        return false;
-    }
-
     /** @hide */
     @SystemApi
     public boolean supplyPin(String pin) {

telephony/java/com/android/internal/telephony/ITelephony.aidl

@@ -181,13 +181,6 @@ interface ITelephony {
      */
     boolean isRadioOnForSubscriber(int subId, String callingPackage);
 
-    /**
-     * Check if the SIM pin lock is enabled.
-     * @return true if the SIM pin lock is enabled.
-     * @param callingPackage The package making the call.
-     */
-    boolean isSimPinEnabled(String callingPackage);
-
     /**
      * Supply a pin to unlock the SIM.  Blocks until a result is determined.
      * @param pin The pin to check.