diff options
| author | 2021-04-06 22:44:48 +0000 | |
|---|---|---|
| committer | 2021-04-06 22:44:48 +0000 | |
| commit | 2cf7f6dacfd682b6dceefa012bd91ddd5ec0df6f (patch) | |
| tree | dcd5d12acbd0653b090e086cb21474ee0044f83a | |
| parent | 35871022c3a655cd9fa56a5ee35b392310481984 (diff) | |
| parent | 25a8bdb63531e2fad9ebc2a903e72511aaa9853e (diff) | |
Merge "API review response for d2d relative APIs." into sc-dev
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionManager.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 6fb6116c389b..e77cad8cf1c3 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -42374,7 +42374,7 @@ package android.telephony { method public void removeOnOpportunisticSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener); method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void removeSubscriptionsFromGroup(@NonNull java.util.List<java.lang.Integer>, @NonNull android.os.ParcelUuid); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDeviceToDeviceStatusSharingContacts(@NonNull java.util.List<android.net.Uri>, int); + method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDeviceToDeviceStatusSharingContacts(int, @NonNull java.util.List<android.net.Uri>); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDeviceToDeviceStatusSharingPreference(int, int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunistic(boolean, int); method public void setSubscriptionOverrideCongested(int, boolean, long); diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 793d1036d544..d8ac08298530 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -3493,8 +3493,8 @@ public class SubscriptionManager { * @param subscriptionId the unique Subscription ID in database */ @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) - public void setDeviceToDeviceStatusSharingPreference( - @DeviceToDeviceStatusSharingPreference int sharing, int subscriptionId) { + public void setDeviceToDeviceStatusSharingPreference(int subscriptionId, + @DeviceToDeviceStatusSharingPreference int sharing) { if (VDBG) { logd("[setDeviceToDeviceStatusSharing] + sharing: " + sharing + " subId: " + subscriptionId); @@ -3525,8 +3525,8 @@ public class SubscriptionManager { * @param subscriptionId The unique Subscription ID in database */ @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) - public void setDeviceToDeviceStatusSharingContacts(@NonNull List<Uri> contacts, - int subscriptionId) { + public void setDeviceToDeviceStatusSharingContacts(int subscriptionId, + @NonNull List<Uri> contacts) { String contactString = serializeUriLists(contacts); if (VDBG) { logd("[setDeviceToDeviceStatusSharingContacts] + contacts: " + contactString |