commit 25a8bdb63531e2fad9ebc2a903e72511aaa9853e
author Grace Jia <xiaotonj@google.com> Mon Mar 29 22:56:57 2021 -0700
committer Grace Jia <xiaotonj@google.com> Tue Mar 30 16:31:53 2021 +0000
tree e580ce1da09c025c72ccb99768fcd510c1ab738a
parent 7eb1c4c24e2039d78d8f609010f830c4fb2c9013

API review response for d2d relative APIs.

Change subscriptionId as the first argument.

Bug: 183052976
Test: CTS test
Change-Id: I3fcc93da519457bfed1955121d020e3c92c0c331

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index f8654478..1222ee0 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -42367,7 +42367,7 @@
     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);

telephony/java/android/telephony/SubscriptionManager.java

diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 67fe783..70a9b69 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -3482,8 +3482,8 @@
      * @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);
@@ -3514,8 +3514,8 @@
      * @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