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

Merge "Make some SubscriptionManager APIs system APIs"

Browse Source
This commit is contained in:
Shuo Qian
2018-12-27 21:58:00 +00:00
committed by Gerrit Code Review
parent 4ec239d760 db49641108
commit 755f2a38ac
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -5397,6 +5397,8 @@ package android.telephony {
public class SubscriptionManager { public class SubscriptionManager {
method public java.util.List<android.telephony.SubscriptionInfo> getAvailableSubscriptionInfoList(); method public java.util.List<android.telephony.SubscriptionInfo> getAvailableSubscriptionInfoList();
method public void requestEmbeddedSubscriptionInfoListRefresh(); method public void requestEmbeddedSubscriptionInfoListRefresh();
method public void setDefaultDataSubId(int);
method public void setDefaultSmsSubId(int);
field public static final android.net.Uri ADVANCED_CALLING_ENABLED_CONTENT_URI; field public static final android.net.Uri ADVANCED_CALLING_ENABLED_CONTENT_URI;
field public static final android.net.Uri VT_ENABLED_CONTENT_URI; field public static final android.net.Uri VT_ENABLED_CONTENT_URI;
field public static final android.net.Uri WFC_ENABLED_CONTENT_URI; field public static final android.net.Uri WFC_ENABLED_CONTENT_URI;

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

@@ -1601,14 +1601,23 @@ public class SubscriptionManager {
return subId; return subId;
} }
/** @hide */ /**
@UnsupportedAppUsage * Set the subscription which will be used by default for SMS, with the subscription which
public void setDefaultSmsSubId(int subId) { * the supplied subscription ID corresponds to; or throw a RuntimeException if the supplied
if (VDBG) logd("setDefaultSmsSubId sub id = " + subId); * subscription ID is not usable (check with {@link #isUsableSubscriptionId(int)}).
*
* @param subscriptionId the supplied subscription ID
*
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public void setDefaultSmsSubId(int subscriptionId) {
if (VDBG) logd("setDefaultSmsSubId sub id = " + subscriptionId);
try { try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) { if (iSub != null) {
iSub.setDefaultSmsSubId(subId); iSub.setDefaultSmsSubId(subscriptionId);
} }
} catch (RemoteException ex) { } catch (RemoteException ex) {
// ignore it // ignore it
@@ -1656,14 +1665,23 @@ public class SubscriptionManager {
return subId; return subId;
} }
/** @hide */ /**
@UnsupportedAppUsage * Set the subscription which will be used by default for data, with the subscription which
public void setDefaultDataSubId(int subId) { * the supplied subscription ID corresponds to; or throw a RuntimeException if the supplied
if (VDBG) logd("setDataSubscription sub id = " + subId); * subscription ID is not usable (check with {@link #isUsableSubscriptionId(int)}).
*
* @param subscriptionId the supplied subscription ID
*
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public void setDefaultDataSubId(int subscriptionId) {
if (VDBG) logd("setDataSubscription sub id = " + subscriptionId);
try { try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) { if (iSub != null) {
iSub.setDefaultDataSubId(subId); iSub.setDefaultDataSubId(subscriptionId);
} }
} catch (RemoteException ex) { } catch (RemoteException ex) {
// ignore it // ignore it