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

Merge "Safety Enhancements and Polish for ICC Logical Channel API"

Browse Source
This commit is contained in:
Chen Xu
2022-02-16 01:59:19 +00:00
committed by Android (Google) Code Review
parent 0af3052782 964a880d59
commit 1b9e95e716
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -6967,6 +6967,11 @@ public class TelephonyManager {
*
* Input parameters equivalent to TS 27.007 AT+CCHO command.
*
* It is strongly recommended that callers of this should firstly create a new TelephonyManager
* instance by calling {@link TelephonyManager#createForSubscriptionId(int)}. Failure to do so
* can result in unpredictable and detrimental behavior like callers can end up talking to the
* wrong SIM card.
*
* <p>Requires Permission:
* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the calling
* app has carrier privileges (see {@link #hasCarrierPrivileges}).
@@ -7060,6 +7065,8 @@ public class TelephonyManager {
}
} catch (RemoteException ex) {
} catch (NullPointerException ex) {
} catch (IllegalStateException ex) {
Rlog.e(TAG, "iccCloseLogicalChannel IllegalStateException", ex);
}
return false;
}
@@ -7107,6 +7114,10 @@ public class TelephonyManager {
* Closes a previously opened logical channel to the ICC card.
*
* Input parameters equivalent to TS 27.007 AT+CCHC command.
* It is strongly recommended that callers of this API should firstly create
* new TelephonyManager instance by calling
* {@link TelephonyManager#createForSubscriptionId(int)}. Failure to do so can result in
* unpredictable and detrimental behavior like callers can end up talking to the wrong SIM card.
*
* <p>Requires Permission:
* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the calling
@@ -7115,6 +7126,7 @@ public class TelephonyManager {
* @param channel is the channel id to be closed as returned by a successful
* iccOpenLogicalChannel.
* @return true if the channel was closed successfully.
* @throws IllegalArgumentException if input parameters are wrong. e.g., invalid channel
*/
@RequiresFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)
public boolean iccCloseLogicalChannel(int channel) {
@@ -7122,8 +7134,6 @@ public class TelephonyManager {
return iccCloseLogicalChannel(getSubId(), channel);
} catch (IllegalStateException ex) {
Rlog.e(TAG, "iccCloseLogicalChannel IllegalStateException", ex);
} catch (IllegalArgumentException ex) {
Rlog.e(TAG, "iccCloseLogicalChannel IllegalArgumentException", ex);
}
return false;
}
@@ -7154,6 +7164,8 @@ public class TelephonyManager {
}
} catch (RemoteException ex) {
} catch (NullPointerException ex) {
} catch (IllegalStateException ex) {
Rlog.e(TAG, "iccCloseLogicalChannel IllegalStateException", ex);
}
return false;
}
@@ -7255,6 +7267,11 @@ public class TelephonyManager {
*
* Input parameters equivalent to TS 27.007 AT+CGLA command.
*
* It is strongly recommended that callers of this API should firstly create a new
* TelephonyManager instance by calling
* {@link TelephonyManager#createForSubscriptionId(int)}. Failure to do so can result in
* unpredictable and detrimental behavior like callers can end up talking to the wrong SIM card.
*
* <p>Requires Permission:
* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the calling
* app has carrier privileges (see {@link #hasCarrierPrivileges}).