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

Commit 116c3655 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Adding module permission for SubscriptionManager"

parents 58340703 6a646db6

core/api/module-lib-current.txt

+5 −0
Original line number Original line Diff line number Diff line
@@ -160,6 +160,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
@@ -1827,8 +1827,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
@@ -1863,7 +1864,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);