Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[MEP] Temporarily bypassing exception"

Browse Source
This commit is contained in:
Sandeep Jawalkar
2021-11-23 15:38:15 +00:00
committed by Android (Google) Code Review
parent 974c389845 4b3d0ddd74
commit 3af224bbbb
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/android/telephony/UiccCardInfo.java
View File

@@ -156,9 +156,11 @@ public final class UiccCardInfo implements Parcelable {
@Nullable
@Deprecated
public String getIccId() {
if (mIccIdAccessRestricted) {
throw new UnsupportedOperationException("getIccId from UiccPortInfo");
}
// Temporarily bypassing exception
// TODO: add exception once refactoring completed.
//if (mIccIdAccessRestricted) {
// throw new UnsupportedOperationException("getIccId from UiccPortInfo");
//}
//always return ICCID from first port.
return getPorts().stream().findFirst().get().getIccId();
}

16
telephony/java/android/telephony/UiccSlotInfo.java
View File

@@ -159,9 +159,11 @@ public class UiccSlotInfo implements Parcelable {
*/
@Deprecated
public boolean getIsActive() {
if (mLogicalSlotAccessRestricted) {
throw new UnsupportedOperationException("get port status from UiccPortInfo");
}
// Temporarily bypassing exception
// TODO: add exception once refactoring completed.
//if (mLogicalSlotAccessRestricted) {
// throw new UnsupportedOperationException("get port status from UiccPortInfo");
//}
//always return status from first port.
return getPorts().stream().findFirst().get().isActive();
}
@@ -196,9 +198,11 @@ public class UiccSlotInfo implements Parcelable {
*/
@Deprecated
public int getLogicalSlotIdx() {
if (mLogicalSlotAccessRestricted) {
throw new UnsupportedOperationException("get logical slot index from UiccPortInfo");
}
// Temporarily bypassing exception
// TODO: add exception once refactoring completed.
//if (mLogicalSlotAccessRestricted) {
// throw new UnsupportedOperationException("get logical slot index from UiccPortInfo");
//}
//always return logical slot index from first port.
//portList always have at least one element.
return getPorts().stream().findFirst().get().getLogicalSlotIndex();