From 3f140106e95d4d457433927e6bc754ae9213619c Mon Sep 17 00:00:00 2001
From: sandeepjs <sandeepjs@google.com>
Date: Fri, 27 May 2022 04:53:34 +0000
Subject: [PATCH] Updating the error message for clear understanding of
 Deprecated methods. Test: manual Bug: 234089071

Change-Id: Ieba3a2e257c8f097dfcdc0c22abe7225ae5bed0c
---
 telephony/java/android/telephony/UiccCardInfo.java | 3 ++-
 telephony/java/android/telephony/UiccSlotInfo.java | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/telephony/java/android/telephony/UiccCardInfo.java b/telephony/java/android/telephony/UiccCardInfo.java
index 249f740c482b7..e5e8f0a41048f 100644
--- a/telephony/java/android/telephony/UiccCardInfo.java
+++ b/telephony/java/android/telephony/UiccCardInfo.java
@@ -162,7 +162,8 @@ public final class UiccCardInfo implements Parcelable {
     @Deprecated
     public String getIccId() {
         if (mIccIdAccessRestricted) {
-            throw new UnsupportedOperationException("getIccId from UiccPortInfo");
+            throw new UnsupportedOperationException("getIccId() is not supported by UiccCardInfo."
+                + " Please Use UiccPortInfo API instead");
         }
         //always return ICCID from first port.
         return getPorts().stream().findFirst().get().getIccId();
diff --git a/telephony/java/android/telephony/UiccSlotInfo.java b/telephony/java/android/telephony/UiccSlotInfo.java
index dd3639a9a7b99..06c5b5cfeda11 100644
--- a/telephony/java/android/telephony/UiccSlotInfo.java
+++ b/telephony/java/android/telephony/UiccSlotInfo.java
@@ -161,7 +161,8 @@ public class UiccSlotInfo implements Parcelable {
     @Deprecated
     public boolean getIsActive() {
         if (mLogicalSlotAccessRestricted) {
-            throw new UnsupportedOperationException("get port status from UiccPortInfo");
+            throw new UnsupportedOperationException("getIsActive() is not supported by "
+            + "UiccSlotInfo. Please Use UiccPortInfo API instead");
         }
         //always return status from first port.
         return getPorts().stream().findFirst().get().isActive();
@@ -198,7 +199,8 @@ public class UiccSlotInfo implements Parcelable {
     @Deprecated
     public int getLogicalSlotIdx() {
         if (mLogicalSlotAccessRestricted) {
-            throw new UnsupportedOperationException("get logical slot index from UiccPortInfo");
+            throw new UnsupportedOperationException("getLogicalSlotIdx() is not supported by "
+                + "UiccSlotInfo. Please use UiccPortInfo API instead");
         }
         //always return logical slot index from first port.
         //portList always have at least one element.