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

Merge "Throw illegal state exception when service is not available" am: 572a358723 am: f431f2cadd am: cd314a3ae6 am: d15332406a am: 5112c028cd

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2160225

Change-Id: Ie4917a9fc0265e0ba705b944bb8290590dd4d43e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jack Yu
2022-07-22 00:01:49 +00:00
committed by Automerger Merge Worker
parent 39e201dd55 5112c028cd
commit 8f32d7e887
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -3121,8 +3121,9 @@ public class SubscriptionManager {
* @param callback Callback will be triggered once it succeeds or failed.
* Pass null if don't care about the result.
*
* @throws IllegalStateException when subscription manager service is not available.
* @throws SecurityException when clients do not have MODIFY_PHONE_STATE permission.
* @hide
*
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
@@ -3132,7 +3133,9 @@ public class SubscriptionManager {
if (VDBG) logd("[setPreferredDataSubscriptionId]+ subId:" + subId);
try {
ISub iSub = TelephonyManager.getSubscriptionService();
if (iSub == null) return;
if (iSub == null) {
throw new IllegalStateException("subscription manager service is null.");
}
ISetOpportunisticDataCallback callbackStub = new ISetOpportunisticDataCallback.Stub() {
@Override
@@ -3152,7 +3155,8 @@ public class SubscriptionManager {
};
iSub.setPreferredDataSubscriptionId(subId, needValidation, callbackStub);
} catch (RemoteException ex) {
// ignore it
loge("setPreferredDataSubscriptionId RemoteException=" + ex);
ex.rethrowFromSystemServer();
}
}