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

Commit ce81ce31 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adding module permission for SubscriptionManager" am: 116c3655 

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

Change-Id: I9e8a4aea7ff0006289000ca0a129fc9886a49223
parents 54a4e7a3 116c3655

core/api/module-lib-current.txt

+5 −0
Original line number Original line Diff line number Diff line
@@ -319,6 +319,11 @@ package android.telephony { 
    method public static int getNumSignalStrengthLevels();

    method public static int getNumSignalStrengthLevels();

  }

  }





  public class SubscriptionManager {

    method public void addSubscriptionInfoRecord(@NonNull String, @Nullable String, int, int);

    method public void removeSubscriptionInfoRecord(@NonNull String, int);

  }



  public class TelephonyManager {

  public class TelephonyManager {

    method @NonNull public static int[] getAllNetworkTypes();

    method @NonNull public static int[] getAllNetworkTypes();

  }

  }

telephony/java/android/telephony/SubscriptionManager.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -1847,8 +1847,9 @@ public class SubscriptionManager { 
     * @param subscriptionType the {@link #SUBSCRIPTION_TYPE}

     * @param subscriptionType the {@link #SUBSCRIPTION_TYPE}

     * @hide

     * @hide

     */

     */

    public void addSubscriptionInfoRecord(String uniqueId, String displayName, int slotIndex,

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

            int subscriptionType) {

    public void addSubscriptionInfoRecord(@NonNull String uniqueId, @Nullable String displayName,

            int slotIndex, int subscriptionType) {

        if (VDBG) {

        if (VDBG) {

            logd("[addSubscriptionInfoRecord]+ uniqueId:" + uniqueId

            logd("[addSubscriptionInfoRecord]+ uniqueId:" + uniqueId

                    + ", displayName:" + displayName + ", slotIndex:" + slotIndex

                    + ", displayName:" + displayName + ", slotIndex:" + slotIndex
@@ -1883,7 +1884,8 @@ public class SubscriptionManager { 
     * @param subscriptionType the {@link #SUBSCRIPTION_TYPE}

     * @param subscriptionType the {@link #SUBSCRIPTION_TYPE}

     * @hide

     * @hide

     */

     */

    public void removeSubscriptionInfoRecord(String uniqueId, int subscriptionType) {

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public void removeSubscriptionInfoRecord(@NonNull String uniqueId, int subscriptionType) {

        if (VDBG) {

        if (VDBG) {

            logd("[removeSubscriptionInfoRecord]+ uniqueId:" + uniqueId

            logd("[removeSubscriptionInfoRecord]+ uniqueId:" + uniqueId

                    + ", subscriptionType: " + subscriptionType);

                    + ", subscriptionType: " + subscriptionType);