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

Merge "Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId()" into qt-dev

Browse Source
This commit is contained in:
Amit Mahajan
2019-06-07 22:25:36 +00:00
committed by Android (Google) Code Review
parent 01dbc2cbe7 900aad9924
commit be063ffb59
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/SmsManager.java
View File

@@ -1975,9 +1975,11 @@ public final class SmsManager {
*/ */
public static int getDefaultSmsSubscriptionId() { public static int getDefaultSmsSubscriptionId() {
try { try {
return getISmsServiceOrThrow().getPreferredSmsSubscription(); return getISmsService().getPreferredSmsSubscription();
} catch (RemoteException e) { } catch (RemoteException e) {
return SubscriptionManager.INVALID_SUBSCRIPTION_ID; return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
} catch (NullPointerException e) {
return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
} }
} }