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

Commit fe520a75 authored by Betty Chang's avatar Betty Chang Committed by android-build-merger
Browse files

Merge "[Telephony Mainline] Add SimInfo.CONTENT_URI instead... 

Merge "[Telephony Mainline] Add SimInfo.CONTENT_URI instead SubscriptionManager.CONTENT_URI for mainline"
am: e74c1f12

Change-Id: Iddf3d7c13d1d72a697a4bbf544e8e35659d8b2d1
parents 03942aba e74c1f12

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -6757,6 +6757,10 @@ package android.provider { 
    field public static final String SUB_ID = "sub_id";

  }













  public static final class Telephony.SimInfo {













    field @NonNull public static final android.net.Uri CONTENT_URI;













  }



























  public static final class Telephony.Sms.Intents {















    field public static final String ACTION_SMS_EMERGENCY_CB_RECEIVED = "android.provider.action.SMS_EMERGENCY_CB_RECEIVED";















  }

































core/java/android/provider/Telephony.java



+19
−0




























Original line number
Diff line number
Diff line








@@ -4800,4 +4800,23 @@ public final class Telephony {













            public static final Uri CONTENT_URI = Uri.parse("content://carrier_id/all");















        }















    }



























    /**













     * Contains SIM Information













     * @hide













     */













    @SystemApi













    public static final class SimInfo {













        /**













         * Not instantiable.













         * @hide













         */













        private SimInfo() {}



























        /**













         * The {@code content://} style URI for this provider.













         */













        @NonNull













        public static final Uri CONTENT_URI = Uri.parse("content://telephony/siminfo");













    }















}
























telephony/java/android/telephony/SubscriptionManager.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -54,6 +54,7 @@ import android.os.ParcelUuid;













import android.os.Process;















import android.os.RemoteException;















import android.os.ServiceManager;













import android.provider.Telephony.SimInfo;















import android.telephony.euicc.EuiccManager;















import android.telephony.ims.ImsMmTelManager;















import android.util.DisplayMetrics;










@@ -129,7 +130,7 @@ public class SubscriptionManager {





























    /** @hide */















    @UnsupportedAppUsage













    public static final Uri CONTENT_URI = Uri.parse("content://telephony/siminfo");













    public static final Uri CONTENT_URI = SimInfo.CONTENT_URI;































    /**















     * Generates a content {@link Uri} used to receive updates on simInfo change