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

Commit e5ac4da1 authored by Sooraj Sasindran's avatar Sooraj Sasindran
Browse files

Make hidden subscription apis as system 

Make following APIs as system

SubscriptionInfo;->isGroupDisabled
TelephonyManager;->isModemEnabledForSlot
TelephonyManager;->setOpportunisticNetworkState

Add a new public API
SubscriptionManager;->getActiveAndHiddenSubscriptionInfoList

As they need to be accessed by system application to configure
the opportunistic subscripion info

Bug: 141122805
Test: verified that CBRS app is still working fine
Merged-In: Idf1520911272ba4b7c1f15671d6221d99ba0ab37
Change-Id: Idf1520911272ba4b7c1f15671d6221d99ba0ab37
parent e6a2c0a4

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -44964,6 +44964,7 @@ package android.telephony { 
    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.os.ParcelUuid createSubscriptionGroup(@NonNull java.util.List<java.lang.Integer>);

    method @Deprecated public static android.telephony.SubscriptionManager from(android.content.Context);

    method public java.util.List<android.telephony.SubscriptionInfo> getAccessibleSubscriptionInfoList();

    method @Nullable public java.util.List<android.telephony.SubscriptionInfo> getActiveAndHiddenSubscriptionInfoList();

    method public static int getActiveDataSubscriptionId();

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfo(int);

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getActiveSubscriptionInfoCount();

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -8550,6 +8550,7 @@ package android.telephony { 
  public class SubscriptionInfo implements android.os.Parcelable {

    method @Nullable public java.util.List<android.telephony.UiccAccessRule> getAccessRules();

    method public int getProfileClass();

    method public boolean isGroupDisabled();

  }















  public class SubscriptionManager {










@@ -8665,7 +8666,9 @@ package android.telephony {













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled();















    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isInEmergencySmsMode();













    method public boolean isModemEnabledForSlot(int);















    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook();













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isOpportunisticNetworkEnabled();















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isPotentialEmergencyNumber(@NonNull String);















    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRadioOn();















    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging();









@@ -8687,6 +8690,7 @@ package android.telephony {













    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultiSimCarrierRestriction(boolean);













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunisticNetworkState(boolean);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmask(long);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadioPower(boolean);

























telephony/java/android/telephony/SubscriptionInfo.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -653,6 +653,7 @@ public class SubscriptionInfo implements Parcelable {













     * Return whether the subscription's group is disabled.















     * @hide















     */













    @SystemApi















    public boolean isGroupDisabled() {















        return mIsGroupDisabled;















    }

































telephony/java/android/telephony/SubscriptionManager.java



+24
−4




























Original line number
Diff line number
Diff line








@@ -1289,13 +1289,33 @@ public class SubscriptionManager {













        return getActiveSubscriptionInfoList(/* userVisibleonly */true);















    }





























    /**













     * Get both hidden and visible SubscriptionInfo(s) of the currently active SIM(s).













     * The records will be sorted by {@link SubscriptionInfo#getSimSlotIndex}













     * then by {@link SubscriptionInfo#getSubscriptionId}.













     *













     * <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}













     * or that the calling app has carrier privileges (see













     * {@link TelephonyManager#hasCarrierPrivileges}). In the latter case, only records accessible













     * to the calling app are returned.













     *













     * @return Sorted list of the currently available {@link SubscriptionInfo}













     * records on the device.













     * This is similar to {@link #getActiveSubscriptionInfoList} except that it will return













     * both active and hidden SubscriptionInfos.













     *













     */













    public @Nullable List<SubscriptionInfo> getActiveAndHiddenSubscriptionInfoList() {













        return getActiveSubscriptionInfoList(/* userVisibleonly */false);













    }





























    /**















    * This is similar to {@link #getActiveSubscriptionInfoList()}, but if userVisibleOnly















    * is true, it will filter out the hidden subscriptions.















    *















    * @hide















    */













    public List<SubscriptionInfo> getActiveSubscriptionInfoList(boolean userVisibleOnly) {













    public @Nullable List<SubscriptionInfo> getActiveSubscriptionInfoList(boolean userVisibleOnly) {















        List<SubscriptionInfo> activeList = null;































        try {

































telephony/java/android/telephony/TelephonyManager.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -10713,6 +10713,7 @@ public class TelephonyManager {













     * @hide















     */















    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)













    @SystemApi















    public boolean setOpportunisticNetworkState(boolean enable) {















        String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";















        boolean ret = false;










@@ -10740,6 +10741,7 @@ public class TelephonyManager {













     * @hide















     */















    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)













    @SystemApi















    public boolean isOpportunisticNetworkEnabled() {















        String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";















        boolean isEnabled = false;










@@ -11477,6 +11479,7 @@ public class TelephonyManager {













     * @param slotIndex which slot it's checking.















     * @hide















     */













    @SystemApi















    public boolean isModemEnabledForSlot(int slotIndex) {















        try {















            ITelephony telephony = getITelephony();