Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25a8bdb6 authored by Grace Jia's avatar Grace Jia
Browse files

API review response for d2d relative APIs. 

Change subscriptionId as the first argument.

Bug: 183052976
Test: CTS test
Change-Id: I3fcc93da519457bfed1955121d020e3c92c0c331
parent 7eb1c4c2

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -42367,7 +42367,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);

telephony/java/android/telephony/SubscriptionManager.java

+4 −4
Original line number Diff line number Diff line
@@ -3482,8 +3482,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);
@@ -3514,8 +3514,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