From c614d7c2d5e37576770e33237612f70b8849bee4 Mon Sep 17 00:00:00 2001
From: Brad Ebinger <breadley@google.com>
Date: Thu, 7 Jan 2016 17:25:50 -0800
Subject: [PATCH] Refactoring and cleanup

Cleans up obsolete parts of services/Telephony and absorbs others
into Telecomm.


Bug: 26204262
Change-Id: I2028ae0177d83241f861cd59fa78b5f5a869f572
---
 api/system-current.txt                              |  1 -
 .../java/android/telephony/TelephonyManager.java    | 13 -------------
 .../com/android/internal/telephony/ITelephony.aidl  |  7 -------
 3 files changed, 21 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index bf8e0e7eb7adb..70eb4f556b317 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -38474,7 +38474,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();
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 913cb18c6ab79..43fe9d100b234 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/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) {
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index d1badc9e7f335..62f294c3a197a 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/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.