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

Commit 96b977f7 authored by Sooraj Sasindran's avatar Sooraj Sasindran
Browse files

Allow Privileged apps to read prefered data state 

Allow Privileged apps to read prefered data state
Change ArrayList to List for public API

Bug: 122900079
Bug: 123697660
Test: verified manually
Change-Id: Ib1221a65edf554b700088d68505da137ccd7de5e
parent 13d5d5a1

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -42083,7 +42083,7 @@ package android.telephony { 
  }















  public final class AvailableNetworkInfo implements android.os.Parcelable {













    ctor public AvailableNetworkInfo(int, int, java.util.ArrayList<java.lang.String>);













    ctor public AvailableNetworkInfo(int, int, java.util.List<java.lang.String>);















    method public int describeContents();















    method public java.util.List<java.lang.String> getMccMncs();















    method public int getPriority();










@@ -43038,7 +43038,7 @@ package android.telephony {













    method public int getNetworkType();















    method public int getPhoneCount();















    method public int getPhoneType();













    method public int getPreferredOpportunisticDataSubscription();













    method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PHONE_STATE}) public int getPreferredOpportunisticDataSubscription();















    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telephony.ServiceState getServiceState();















    method @Nullable public android.telephony.SignalStrength getSignalStrength();















    method public int getSimCarrierId();

























telephony/java/android/telephony/AvailableNetworkInfo.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -114,7 +114,7 @@ public final class AvailableNetworkInfo implements Parcelable {













        in.readStringList(mMccMncs);















    }





























    public AvailableNetworkInfo(int subId, int priority, ArrayList<String> mccMncs) {













    public AvailableNetworkInfo(int subId, int priority, List<String> mccMncs) {















        mSubId = subId;















        mPriority = priority;















        mMccMncs = new ArrayList<String>(mccMncs);

































telephony/java/android/telephony/TelephonyManager.java



+8
−3




























Original line number
Diff line number
Diff line








@@ -9508,10 +9508,10 @@ public class TelephonyManager {













     *















     * <p>















     * Requires Permission:













     *   {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}













     *   {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE READ_PRIVILEGED_PHONE_STATE}















     * @hide















     */













    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)













    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)















    public boolean isOpportunisticNetworkEnabled() {















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















        boolean isEnabled = false;










@@ -9892,12 +9892,17 @@ public class TelephonyManager {













     * Get preferred opportunistic data subscription Id















     *















     * <p>Requires that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}),













     * or has permission {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}.













     * or has either READ_PRIVILEGED_PHONE_STATE













     * or {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} permission.















     * @return subId preferred opportunistic subscription id or















     * {@link SubscriptionManager#DEFAULT_SUBSCRIPTION_ID} if there are no preferred















     * subscription id















     *















     */













    @RequiresPermission(anyOf = {













            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,













            android.Manifest.permission.READ_PHONE_STATE













    })















    public int getPreferredOpportunisticDataSubscription() {















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















        int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;