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

Merge changes I44dc66f9,I72ee7af9

Browse Source 
* changes:
  Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId()
  Fix the default sub id returned by SmsManager.
This commit is contained in:
Amit Mahajan
2019-06-13 22:47:13 +00:00
committed by Gerrit Code Review
parent 781ac9ef8e 15fbc62662
commit cb7c0be8fb
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1958,16 +1958,24 @@ public final class SmsManager {
}
/**
* Get default sms subscription id
* Get default sms subscription id.
*
* @return the user-defined default SMS subscription id or
* {@link SubscriptionManager#INVALID_SUBSCRIPTION_ID} if no default is set.
* <p class="note"><strong>Note:</strong>This returns a value different from
* {@link SubscriptionManager#getDefaultSmsSubscriptionId} if the user has not chosen a default.
* In this case it returns the active subscription id if there's only one active subscription
* available.
*
* @return the user-defined default SMS subscription id, or the active subscription id if
* there's only one active subscription available, otherwise
* {@link SubscriptionManager#INVALID_SUBSCRIPTION_ID}.
*/
public static int getDefaultSmsSubscriptionId() {
try {
return SubscriptionManager.getDefaultSmsSubscriptionId();
} catch (NullPointerException ex) {
return -1;
return getISmsService().getPreferredSmsSubscription();
} catch (RemoteException e) {
return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
} catch (NullPointerException e) {
return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
}
}