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

Commit 861c7e5d authored by Rambo Wang's avatar Rambo Wang
Browse files

Protect SID and NID in ServiceState with coarse location permission 

While SystemId/NetworkId in 3gpp2 network are not a one to one match
of MCC/MNC in 3gpp network, they servie the similar purpose and
should have same level of privacy protection.

To have a consistent privacy protection policy, SID/NID are also
redacted when calling app has no location permission.

Bug: 188061647
Test: atest ServiceStateTest ServiceStateProviderTest
Change-Id: Ibf068f950c82270f59aa40e8bb6721f8b9c989bf
parent 9d805c35

core/api/current.txt

+5 −5
Original line number Diff line number Diff line
@@ -41086,16 +41086,16 @@ package android.telephony { 
    ctor @Deprecated public ServiceState(android.os.Parcel);

    method protected void copyFrom(android.telephony.ServiceState);

    method public int describeContents();

    method public int getCdmaNetworkId();

    method public int getCdmaSystemId();

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public int getCdmaNetworkId();

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public int getCdmaSystemId();

    method public int[] getCellBandwidths();

    method public int getChannelNumber();

    method public int getDuplexMode();

    method public boolean getIsManualSelection();

    method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoList();

    method public String getOperatorAlphaLong();

    method public String getOperatorAlphaShort();

    method public String getOperatorNumeric();

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public String getOperatorAlphaLong();

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public String getOperatorAlphaShort();

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public String getOperatorNumeric();

    method public boolean getRoaming();

    method public int getState();

    method public boolean isSearching();

telephony/java/android/telephony/ServiceState.java

+57 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.telephony; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.compat.annotation.UnsupportedAppUsage;
@@ -767,6 +768,10 @@ public class ServiceState implements Parcelable { 
     *

     * @return long name of operator, null if unregistered or unknown

     */

    @RequiresPermission(anyOf = {

            android.Manifest.permission.ACCESS_FINE_LOCATION,

            android.Manifest.permission.ACCESS_COARSE_LOCATION

    })

    public String getOperatorAlphaLong() {

        return mOperatorAlphaLong;

    }
@@ -782,6 +787,10 @@ public class ServiceState implements Parcelable { 
     * @return long name of operator

     * @hide

     */

    @RequiresPermission(anyOf = {

            android.Manifest.permission.ACCESS_FINE_LOCATION,

            android.Manifest.permission.ACCESS_COARSE_LOCATION

    })

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q,

            publicAlternatives = "Use {@link #getOperatorAlphaLong} instead.")

    public String getVoiceOperatorAlphaLong() {
@@ -800,6 +809,10 @@ public class ServiceState implements Parcelable { 
     *

     * @return short name of operator, null if unregistered or unknown

     */

    @RequiresPermission(anyOf = {

            android.Manifest.permission.ACCESS_FINE_LOCATION,

            android.Manifest.permission.ACCESS_COARSE_LOCATION

    })

    public String getOperatorAlphaShort() {

        return mOperatorAlphaShort;

    }
@@ -815,6 +828,10 @@ public class ServiceState implements Parcelable { 
     * @return short name of operator, null if unregistered or unknown

     * @hide

     */

    @RequiresPermission(anyOf = {

            android.Manifest.permission.ACCESS_FINE_LOCATION,

            android.Manifest.permission.ACCESS_COARSE_LOCATION

    })

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q,

            publicAlternatives = "Use {@link #getOperatorAlphaShort} instead.")

    public String getVoiceOperatorAlphaShort() {
@@ -832,6 +849,10 @@ public class ServiceState implements Parcelable { 
     * @return short name of operator, null if unregistered or unknown

     * @hide

     */

    @RequiresPermission(anyOf = {

            android.Manifest.permission.ACCESS_FINE_LOCATION,

            android.Manifest.permission.ACCESS_COARSE_LOCATION

    })

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q,

            publicAlternatives = "Use {@link #getOperatorAlphaShort} instead.")

    public String getDataOperatorAlphaShort() {
@@ -853,6 +874,10 @@ public class ServiceState implements Parcelable { 
     * @return name of operator, null if unregistered or unknown

     * @hide

     */

    @RequiresPermission(anyOf = {

            android.Manifest.permission.ACCESS_FINE_LOCATION,

            android.Manifest.permission.ACCESS_COARSE_LOCATION

    })

    public String getOperatorAlpha() {

        if (TextUtils.isEmpty(mOperatorAlphaLong)) {

            return mOperatorAlphaShort;
@@ -878,6 +903,10 @@ public class ServiceState implements Parcelable { 
     * The country code can be decoded using

     * {@link com.android.internal.telephony.MccTable#countryCodeForMcc(int)}.

     */

    @RequiresPermission(anyOf = {

            android.Manifest.permission.ACCESS_FINE_LOCATION,

            android.Manifest.permission.ACCESS_COARSE_LOCATION

    })

    public String getOperatorNumeric() {

        return mOperatorNumeric;

    }
@@ -893,6 +922,10 @@ public class ServiceState implements Parcelable { 
     * @return numeric format of operator, null if unregistered or unknown

     * @hide

     */

    @RequiresPermission(anyOf = {

            android.Manifest.permission.ACCESS_FINE_LOCATION,

            android.Manifest.permission.ACCESS_COARSE_LOCATION

    })

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public String getVoiceOperatorNumeric() {

        return mOperatorNumeric;
@@ -909,6 +942,10 @@ public class ServiceState implements Parcelable { 
     * @return numeric format of operator, null if unregistered or unknown

     * @hide

     */

    @RequiresPermission(anyOf = {

            android.Manifest.permission.ACCESS_FINE_LOCATION,

            android.Manifest.permission.ACCESS_COARSE_LOCATION

    })

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q,

            publicAlternatives = "Use {@link #getOperatorNumeric} instead.")

    public String getDataOperatorNumeric() {
@@ -1758,8 +1795,17 @@ public class ServiceState implements Parcelable { 
    /**

     * Get the CDMA NID (Network Identification Number), a number uniquely identifying a network

     * within a wireless system. (Defined in 3GPP2 C.S0023 3.4.8)

     *

     * <p>Require at least {@link android.Manifest.permission#ACCESS_FINE_LOCATION} or

     * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. Otherwise return

     * {@link #UNKNOWN_ID}.

     *

     * @return The CDMA NID or {@link #UNKNOWN_ID} if not available.

     */

    @RequiresPermission(anyOf = {

            android.Manifest.permission.ACCESS_FINE_LOCATION,

            android.Manifest.permission.ACCESS_COARSE_LOCATION

    })

    public int getCdmaNetworkId() {

        return this.mNetworkId;

    }
@@ -1767,8 +1813,17 @@ public class ServiceState implements Parcelable { 
    /**

     * Get the CDMA SID (System Identification Number), a number uniquely identifying a wireless

     * system. (Defined in 3GPP2 C.S0023 3.4.8)

     *

     * <p>Require at least {@link android.Manifest.permission#ACCESS_FINE_LOCATION} or

     * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. Otherwise return

     * {@link #UNKNOWN_ID}.

     *

     * @return The CDMA SID or {@link #UNKNOWN_ID} if not available.

     */

    @RequiresPermission(anyOf = {

            android.Manifest.permission.ACCESS_FINE_LOCATION,

            android.Manifest.permission.ACCESS_COARSE_LOCATION

    })

    public int getCdmaSystemId() {

        return this.mSystemId;

    }
@@ -2069,6 +2124,8 @@ public class ServiceState implements Parcelable { 
        state.mOperatorAlphaLong = null;

        state.mOperatorAlphaShort = null;

        state.mOperatorNumeric = null;

        state.mSystemId = UNKNOWN_ID;

        state.mNetworkId = UNKNOWN_ID;



        return state;

    }