From 274baa73c51490e10fffe2ccac9c626c8f459cc4 Mon Sep 17 00:00:00 2001
From: Derek Tan <derektan@google.com>
Date: Fri, 5 Sep 2014 14:14:35 -0700
Subject: [PATCH] Remove setCdmaSubscription API.

Bug: 17255752
Change-Id: I0adc5c3d1b690d86f538c084d17d239f7ffccfca
---
 api/current.txt                                    |  1 -
 .../java/android/telephony/TelephonyManager.java   | 22 ----------------------
 .../com/android/internal/telephony/ITelephony.aidl |  9 ---------
 3 files changed, 32 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index eb1aedc36f11..2a8f26694f5b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -29046,7 +29046,6 @@ package android.telephony {
     method public boolean isSmsCapable();
     method public void listen(android.telephony.PhoneStateListener, int);
     method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
-    method public boolean setCdmaSubscription(int);
     method public void setLine1NumberForDisplay(java.lang.String, java.lang.String);
     method public void setLine1NumberForDisplay(long, java.lang.String, java.lang.String);
     method public boolean setOperatorBrandOverride(java.lang.String, java.lang.String);
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index cdee3de0e4e9..102b11f7d663 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2967,28 +2967,6 @@ public class TelephonyManager {
     }
 
     /**
-     * Set the CDMA subscription source.
-     * Used for device supporting both NV and RUIM for CDMA.
-     * <p>
-     * Requires Permission:
-     *   {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
-     * Or the calling app has carrier privileges. @see #hasCarrierPrivileges
-     *
-     * @param subscriptionType the subscription type, 0 for RUIM, 1 for NV.
-     * @return true on success; false on any failure.
-     */
-    public boolean setCdmaSubscription(int subscriptionType) {
-        try {
-            return getITelephony().setCdmaSubscription(subscriptionType);
-        } catch (RemoteException ex) {
-            Rlog.e(TAG, "setCdmaSubscription RemoteException", ex);
-        } catch (NullPointerException ex) {
-            Rlog.e(TAG, "setCdmaSubscription NPE", ex);
-        }
-        return false;
-    }
-
-    /**
      * Values used to return status for hasCarrierPrivileges call.
      */
     public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1;
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index 5c3dcdb07fd5..fe8bc4e1d6bd 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -643,15 +643,6 @@ interface ITelephony {
     boolean setPreferredNetworkType(int networkType);
 
     /**
-     * Set the CDMA subscription source.
-     * Used for device supporting both NV and RUIM for CDMA.
-     *
-     * @param subscriptionType the subscription type, 0 for RUIM, 1 for NV.
-     * @return true on success; false on any failure.
-     */
-    boolean setCdmaSubscription(int subscriptionType);
-
-    /**
      * User enable/disable Mobile Data.
      *
      * @param enable true to turn on, else false
-- 
2.11.0