From f23960fa57da923176985d13afb0ed8531014b2b Mon Sep 17 00:00:00 2001
From: Nathan Harold <nharold@google.com>
Date: Fri, 3 Jan 2020 17:52:13 -0800
Subject: 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 1af97c9d91cd952347192c8a95e46dfa4d827092)
---
 api/system-current.txt                             | 7 +++++++
 telephony/java/android/telephony/CellIdentity.java | 1 +
 2 files changed, 8 insertions(+)

diff --git a/api/system-current.txt b/api/system-current.txt
index 300885148e46..27d8f725a300 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -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 {
diff --git a/telephony/java/android/telephony/CellIdentity.java b/telephony/java/android/telephony/CellIdentity.java
index ce32dce834db..534546921ebf 100644
--- a/telephony/java/android/telephony/CellIdentity.java
+++ b/telephony/java/android/telephony/CellIdentity.java
@@ -191,6 +191,7 @@ public abstract class CellIdentity implements Parcelable {
      *
      * @hide
      */
+    @SystemApi
     public abstract @NonNull CellIdentity sanitizeLocationInfo();
 
     @Override
-- 
cgit v1.2.3-59-g8ed1b