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

Commit 3ccc45f9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "API review response for d2d relative APIs." into sc-dev am: 2cf7f6da 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14025183

Change-Id: I998690d589d61454ee26d16575f2d71c5ce5db45
parents 065a1069 2cf7f6da

core/api/current.txt

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