Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expose sanitizeLocationInfo as SystemApi

Browse Source 
To support scrubbing the CellIdentity field from
within TelephonyRegistry, based on the changes for
mainline, this needs to be a SystemApi.

Bug: 147152984
Test: make update-api && make
Merged-In: If1cb6519a3da60ff0afab001c2804aaa70923dac
Change-Id: If1cb6519a3da60ff0afab001c2804aaa70923dac
(cherry picked from commit 1af97c9d91)
This commit is contained in:
Nathan Harold
2020-01-03 17:52:13 -08:00
parent c41cb737ed
commit f23960fa57
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/system-current.txt
View File

@@ -8159,30 +8159,37 @@ package android.telephony {
public abstract class CellIdentity implements android.os.Parcelable {
method @NonNull public abstract android.telephony.CellLocation asCellLocation();
method @NonNull public abstract android.telephony.CellIdentity sanitizeLocationInfo();
}
public final class CellIdentityCdma extends android.telephony.CellIdentity {
method @NonNull public android.telephony.cdma.CdmaCellLocation asCellLocation();
method @NonNull public android.telephony.CellIdentityCdma sanitizeLocationInfo();
}
public final class CellIdentityGsm extends android.telephony.CellIdentity {
method @NonNull public android.telephony.gsm.GsmCellLocation asCellLocation();
method @NonNull public android.telephony.CellIdentityGsm sanitizeLocationInfo();
}
public final class CellIdentityLte extends android.telephony.CellIdentity {
method @NonNull public android.telephony.gsm.GsmCellLocation asCellLocation();
method @NonNull public android.telephony.CellIdentityLte sanitizeLocationInfo();
}
public final class CellIdentityNr extends android.telephony.CellIdentity {
method @NonNull public android.telephony.CellLocation asCellLocation();
method @NonNull public android.telephony.CellIdentityNr sanitizeLocationInfo();
}
public final class CellIdentityTdscdma extends android.telephony.CellIdentity {
method @NonNull public android.telephony.gsm.GsmCellLocation asCellLocation();
method @NonNull public android.telephony.CellIdentityTdscdma sanitizeLocationInfo();
}
public final class CellIdentityWcdma extends android.telephony.CellIdentity {
method @NonNull public android.telephony.gsm.GsmCellLocation asCellLocation();
method @NonNull public android.telephony.CellIdentityWcdma sanitizeLocationInfo();
}
public final class DataFailCause {

1
telephony/java/android/telephony/CellIdentity.java
View File

@@ -191,6 +191,7 @@ public abstract class CellIdentity implements Parcelable {
*
* @hide
*/
@SystemApi
public abstract @NonNull CellIdentity sanitizeLocationInfo();
@Override