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

Commit 2cf7f6da authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "API review response for d2d relative APIs." into sc-dev

parents 35871022 25a8bdb6

core/api/current.txt

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

telephony/java/android/telephony/SubscriptionManager.java

+4 −4
Original line number Diff line number Diff line
@@ -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