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

Commit 114b7ffa authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge changes from topics "remove_subscription", "setgetproperties" 

* changes:
  Added remove subscription support
  Support get/set subscription property
parents 7dd50276 5b20f5c6

src/java/com/android/internal/telephony/SubscriptionController.java

+0 −1
Original line number Diff line number Diff line
@@ -2717,7 +2717,6 @@ public class SubscriptionController extends ISub.Stub { 
    /**

     * @return the number of records cleared

     */

    @Override

    public int clearSubInfo() {

        enforceModifyPhoneState("clearSubInfo");

src/java/com/android/internal/telephony/subscription/SubscriptionDatabaseManager.java

+466 −72

File changed.

Preview size limit exceeded, changes collapsed.

src/java/com/android/internal/telephony/subscription/SubscriptionInfoInternal.java

+20 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ package com.android.internal.telephony.subscription; 


import android.annotation.ColorInt;

import android.annotation.NonNull;

import android.annotation.UserIdInt;

import android.os.UserHandle;

import android.provider.Telephony.SimInfo;

import android.telephony.SubscriptionInfo;
@@ -952,6 +953,7 @@ public class SubscriptionInfoInternal { 
    /**

     * @return The user id associated with this subscription.

     */

    @UserIdInt

    public int getUserId() {

        return mUserId;

    }
@@ -1800,6 +1802,23 @@ public class SubscriptionInfoInternal { 
            return this;

        }



        /**

         * Set whether an embedded subscription is on a removable card. Such subscriptions are

         * marked inaccessible as soon as the current card is removed. Otherwise, they will remain

         * accessible unless explicitly deleted. Only meaningful when {@link #getEmbedded()} is

         * {@code 1}.

         *

         * @param isRemovableEmbedded {@code true} if the subscription is from the removable

         * embedded SIM.

         *

         * @return The builder.

         */

        @NonNull

        public Builder setRemovableEmbedded(boolean isRemovableEmbedded) {

            mIsRemovableEmbedded = isRemovableEmbedded ? 1 : 0;

            return this;

        }



        /**

         * Set whether an embedded subscription is on a removable card. Such subscriptions are

         * marked inaccessible as soon as the current card is removed. Otherwise, they will remain
@@ -2207,7 +2226,7 @@ public class SubscriptionInfoInternal { 
         * @return The builder.

         */

        @NonNull

        public Builder setUserId(int userId) {

        public Builder setUserId(@UserIdInt int userId) {

            mUserId = userId;

            return this;

        }

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+294 −63

File changed.

Preview size limit exceeded, changes collapsed.

tests/telephonytests/src/com/android/internal/telephony/subscription/SubscriptionDatabaseManagerTest.java

+487 −42

File changed.

Preview size limit exceeded, changes collapsed.