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

Commit f23960fa authored by Nathan Harold's avatar Nathan Harold
Browse files

Expose sanitizeLocationInfo as SystemApi 

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 1af97c9d)
parent c41cb737

api/system-current.txt

+7 −0
Original line number Original line Diff line number Diff line
@@ -8159,30 +8159,37 @@ package android.telephony { 
















  public abstract class CellIdentity implements android.os.Parcelable {







  public abstract class CellIdentity implements android.os.Parcelable {











    method @NonNull public abstract android.telephony.CellLocation asCellLocation();







    method @NonNull public abstract android.telephony.CellLocation asCellLocation();














    method @NonNull public abstract android.telephony.CellIdentity sanitizeLocationInfo();











  }







  }



























  public final class CellIdentityCdma extends android.telephony.CellIdentity {







  public final class CellIdentityCdma extends android.telephony.CellIdentity {











    method @NonNull public android.telephony.cdma.CdmaCellLocation asCellLocation();







    method @NonNull public android.telephony.cdma.CdmaCellLocation asCellLocation();














    method @NonNull public android.telephony.CellIdentityCdma sanitizeLocationInfo();











  }







  }



























  public final class CellIdentityGsm extends android.telephony.CellIdentity {







  public final class CellIdentityGsm extends android.telephony.CellIdentity {











    method @NonNull public android.telephony.gsm.GsmCellLocation asCellLocation();







    method @NonNull public android.telephony.gsm.GsmCellLocation asCellLocation();














    method @NonNull public android.telephony.CellIdentityGsm sanitizeLocationInfo();











  }







  }



























  public final class CellIdentityLte extends android.telephony.CellIdentity {







  public final class CellIdentityLte extends android.telephony.CellIdentity {











    method @NonNull public android.telephony.gsm.GsmCellLocation asCellLocation();







    method @NonNull public android.telephony.gsm.GsmCellLocation asCellLocation();














    method @NonNull public android.telephony.CellIdentityLte sanitizeLocationInfo();











  }







  }



























  public final class CellIdentityNr extends android.telephony.CellIdentity {







  public final class CellIdentityNr extends android.telephony.CellIdentity {











    method @NonNull public android.telephony.CellLocation asCellLocation();







    method @NonNull public android.telephony.CellLocation asCellLocation();














    method @NonNull public android.telephony.CellIdentityNr sanitizeLocationInfo();











  }







  }



























  public final class CellIdentityTdscdma extends android.telephony.CellIdentity {







  public final class CellIdentityTdscdma extends android.telephony.CellIdentity {











    method @NonNull public android.telephony.gsm.GsmCellLocation asCellLocation();







    method @NonNull public android.telephony.gsm.GsmCellLocation asCellLocation();














    method @NonNull public android.telephony.CellIdentityTdscdma sanitizeLocationInfo();











  }







  }



























  public final class CellIdentityWcdma extends android.telephony.CellIdentity {







  public final class CellIdentityWcdma extends android.telephony.CellIdentity {











    method @NonNull public android.telephony.gsm.GsmCellLocation asCellLocation();







    method @NonNull public android.telephony.gsm.GsmCellLocation asCellLocation();














    method @NonNull public android.telephony.CellIdentityWcdma sanitizeLocationInfo();











  }







  }



























  public final class DataFailCause {







  public final class DataFailCause {

























telephony/java/android/telephony/CellIdentity.java



+1
−0




























Original line number
Original line
Diff line number
Diff line








@@ -191,6 +191,7 @@ public abstract class CellIdentity implements Parcelable {









     *







     *











     * @hide







     * @hide











     */







     */














    @SystemApi











    public abstract @NonNull CellIdentity sanitizeLocationInfo();







    public abstract @NonNull CellIdentity sanitizeLocationInfo();































    @Override







    @Override