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

Commit 61301be6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Improvements of D2D API according to the review" into sc-dev am: 7d560e66 

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

Change-Id: Ic01685bdb496f95761351292962b316d5bc2c92a
parents d799f32a 7d560e66

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -42128,7 +42128,7 @@ package android.telephony { 
    method public static int getDefaultSmsSubscriptionId();

    method public static int getDefaultSubscriptionId();

    method public static int getDefaultVoiceSubscriptionId();

    method public int getDeviceToDeviceStatusSharing(int);

    method public int getDeviceToDeviceStatusSharingPreference(int);

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<android.telephony.SubscriptionInfo> getOpportunisticSubscriptions();

    method public static int getSlotIndex(int);

    method @Nullable public int[] getSubscriptionIds(int);
@@ -42141,7 +42141,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 setDeviceToDeviceStatusSharing(int, int);

    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);

    method public void setSubscriptionOverrideCongested(int, boolean, @NonNull int[], long);

telephony/java/android/telephony/SubscriptionManager.java

+14 −12
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ public class SubscriptionManager { 
                    D2D_SHARING_STARRED_CONTACTS,

                    D2D_SHARING_ALL

            })

    public @interface DeviceToDeviceStatusSharing {}

    public @interface DeviceToDeviceStatusSharingPreference {}



    /**

     * TelephonyProvider column name for device to device sharing status.
@@ -3415,29 +3415,31 @@ public class SubscriptionManager { 
     * app uses this method to indicate with whom they wish to share device to device status

     * information.

     * @param sharing the status sharing preference

     * @param subId the unique Subscription ID in database

     * @param subscriptionId the unique Subscription ID in database

     */

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    public void setDeviceToDeviceStatusSharing(@DeviceToDeviceStatusSharing int sharing,

            int subId) {

    public void setDeviceToDeviceStatusSharingPreference(

            @DeviceToDeviceStatusSharingPreference int sharing, int subscriptionId) {

        if (VDBG) {

            logd("[setDeviceToDeviceStatusSharing] + sharing: " + sharing + " subId: " + subId);

            logd("[setDeviceToDeviceStatusSharing] + sharing: " + sharing + " subId: "

                    + subscriptionId);

        }

        setSubscriptionPropertyHelper(subId, "setDeviceToDeviceSharingStatus",

                (iSub)->iSub.setDeviceToDeviceStatusSharing(sharing, subId));

        setSubscriptionPropertyHelper(subscriptionId, "setDeviceToDeviceSharingStatus",

                (iSub)->iSub.setDeviceToDeviceStatusSharing(sharing, subscriptionId));

    }



    /**

     * Returns the user-chosen device to device status sharing preference

     * @param subId Subscription id of subscription

     * @param subscriptionId Subscription id of subscription

     * @return The device to device status sharing preference

     */

    public @DeviceToDeviceStatusSharing int getDeviceToDeviceStatusSharing(int subId) {

    public @DeviceToDeviceStatusSharingPreference int getDeviceToDeviceStatusSharingPreference(

            int subscriptionId) {

        if (VDBG) {

            logd("[getDeviceToDeviceStatusSharing] + subId: " + subId);

            logd("[getDeviceToDeviceStatusSharing] + subId: " + subscriptionId);

        }

        return getIntegerSubscriptionProperty(subId, D2D_STATUS_SHARING, D2D_SHARING_DISABLED,

                mContext);

        return getIntegerSubscriptionProperty(subscriptionId, D2D_STATUS_SHARING,

                D2D_SHARING_DISABLED, mContext);

    }



    /**