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

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

Merge "Add user handle in SimInfo database." am: 15bc01b9 

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



Change-Id: Id7d969863c7814f0b981866caeb7b42a2f160f06
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6e5bb402 15bc01b9

core/java/android/provider/Telephony.java

+7 −0
Original line number Diff line number Diff line
@@ -4815,5 +4815,12 @@ public final class Telephony { 
         * @hide

         */

        public static final String COLUMN_USAGE_SETTING = "usage_setting";



        /**

         * TelephonyProvider column name for user handle associated with this sim.

         *

         * @hide

         */

        public static final String COLUMN_USER_HANDLE = "user_handle";

    }

}

telephony/java/android/telephony/SubscriptionManager.java

+7 −0
Original line number Diff line number Diff line
@@ -1048,6 +1048,13 @@ public class SubscriptionManager { 
    public static final String ALLOWED_NETWORK_TYPES =

            SimInfo.COLUMN_ALLOWED_NETWORK_TYPES_FOR_REASONS;



    /**

     * TelephonyProvider column name for user handle associated with a sim.

     * <P>Type: INTEGER (int)</P>

     * @hide

     */

    public static final String USER_HANDLE = SimInfo.COLUMN_USER_HANDLE;



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = {"USAGE_SETTING_"},