Revert "Update the getIccId docs to reflect access requirements"q10.0

This reverts commit 1a77d9a8182bfe67fb27f1c0aaea6675eac06f8d.

Change-Id: I84dbb37fcfc2ae30bc72562f00c65917d72fdd6a

1 files changed, 1 insertions, 31 deletions

diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java
index 0652afcf6b9e..175929b5cc0a 100644
--- a/telephony/java/android/telephony/SubscriptionInfo.java
+++ b/telephony/java/android/telephony/SubscriptionInfo.java
@@ -39,9 +39,6 @@ import android.util.DisplayMetrics;
 import android.util.Log;
 
 import java.util.ArrayList;
-
-import com.android.telephony.Rlog;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -212,19 +209,6 @@ public class SubscriptionInfo implements Parcelable {
     private int mSubscriptionType;
 
     /**
-     * Public copy constructor.
-     * @hide
-     */
-    public SubscriptionInfo(SubscriptionInfo info) {
-        this(info.mId, info.mIccId, info.mSimSlotIndex, info.mDisplayName, info.mCarrierName,
-                info.mNameSource, info.mIconTint, info.mNumber, info.mDataRoaming, info.mIconBitmap,
-                info.mMcc, info.mMnc, info.mCountryIso, info.mIsEmbedded, info.mAccessRules,
-                info.mCardString, info.mCardId, info.mIsOpportunistic,
-                info.mGroupUUID == null ? null : info.mGroupUUID.toString(), info.mIsGroupDisabled,
-                info.mCarrierId, info.mProfileClass, info.mSubscriptionType, info.mGroupOwner);
-    }
-
-    /**
      * @hide
      */
     public SubscriptionInfo(int id, String iccId, int simSlotIndex, CharSequence displayName,
@@ -297,27 +281,13 @@ public class SubscriptionInfo implements Parcelable {
     }
 
     /**
-     * Returns the ICC ID if the calling app has been granted the READ_PRIVILEGED_PHONE_STATE
-     * permission, has carrier privileges (see {@link TelephonyManager#hasCarrierPrivileges}), or
-     * is a device owner or profile owner that has been granted the READ_PHONE_STATE permission.
-     * The profile owner is an app that owns a managed profile on the device; for more details see
-     * <a href="https://developer.android.com/work/managed-profiles">Work profiles</a>. Profile
-     * owner access is deprecated and will be removed in a future release.
-     *
-     * @return the ICC ID, or an empty string if one of these requirements is not met
+     * @return the ICC ID.
      */
     public String getIccId() {
         return this.mIccId;
     }
 
     /**
-     * @hide
-     */
-    public void clearIccId() {
-        this.mIccId = "";
-    }
-
-    /**
      * @return the slot index of this Subscription's SIM card.
      */
     public int getSimSlotIndex() {