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

Commit a79f779d authored by Wink Saville's avatar Wink Saville
Browse files

Import translations. DO NOT MERGE 

This is for lmp-sprout-dev only.

Hide provider/Telephony#SUB_ID column names.

Hide SmsManager#getSubId, SmsManager#getSmsManagerForSubscriber.

Also "unlink" references to SubscriptionManager because
SubscriptionManager is being hidden for lmp-sprout-dev we can't
have @link references to SubscriptionManager.

Change-Id: I81d9fa01bba7b1fad72952134b697b57beed91ab
parent 88474fa2

src/java/android/provider/Telephony.java

+7 −3
Original line number Diff line number Diff line
@@ -241,9 +241,10 @@ public final class Telephony { 


        /**

         * The sub_id to which the message belongs to. Its value will be

         * {@link android.telephony.SubscriptionManager#INVALID_SUB_ID} if the sub id cannot be

         * android.telephony.SubscriptionManager#INVALID_SUB_ID if the sub id cannot be

         * determined.

         * <p>Type: INTEGER (long) </p>

         * @hide

         */

        public static final String SUB_ID = "sub_id";
@@ -1709,9 +1710,10 @@ public final class Telephony { 


        /**

         * The sub_id to which the message belongs to. Its value will be

         * {@link android.telephony.SubscriptionManager#INVALID_SUB_ID} if the sub id cannot be

         * android.telephony.SubscriptionManager#INVALID_SUB_ID if the sub id cannot be

         * determined.

         * <p>Type: INTEGER (long)</p>

         * @hide

         */

        public static final String SUB_ID = "sub_id";
@@ -2551,9 +2553,10 @@ public final class Telephony { 


            /**

             * The sub_id to which the message belongs to. Its value will be

             * {@link android.telephony.SubscriptionManager#INVALID_SUB_ID} if the sub id cannot be

             * android.telephony.SubscriptionManager#INVALID_SUB_ID if the sub id cannot be

             * determined.

             * <p>Type: INTEGER (long) </p>

             * @hide

             */

            public static final String SUB_ID = "pending_sub_id";

        }
@@ -2766,6 +2769,7 @@ public final class Telephony { 
        /**

         * The sub_id to which the APN belongs to

         * <p>Type: INTEGER (long) </p>

         * @hide

         */

        public static final String SUB_ID = "sub_id";

src/java/android/telephony/SmsManager.java

+4 −2
Original line number Diff line number Diff line
@@ -469,8 +469,9 @@ public final class SmsManager { 
     * Get the the instance of the SmsManager associated with a particular subId

     *

     * @param subId a SMS subscription id, typically accessed using

     *   {@link android.telephony.SubscriptionManager}

     *        android.telephony.SubscriptionManager

     * @return the instance of the SmsManager associated with subId

     * @hide

     */

    public static SmsManager getSmsManagerForSubscriber(long subId) {

        // TODO(shri): Add javadoc link once SubscriptionManager is made public api
@@ -491,10 +492,11 @@ public final class SmsManager { 
    /**

     * Get the associated subId. If the instance was returned by {@link #getDefault()}, then this

     * method may return different values at different points in time (if the user changes the

     * default subId). It will return {@link android.telephony.SubscriptionManager#INVALID_SUB_ID}

     * default subId). It will return android.telephony.SubscriptionManager#INVALID_SUB_ID

     * if the default subId cannot be determined.

     *

     * @return associated subId

     * @hide

     */

    public long getSubId() {

        if (mSubId == DEFAULT_SUB_ID) {