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

Merge changes from topics "141018421_set3", "146905502", "remove_getPhoneId"

Browse Source 
am: 939d3d62cd

Change-Id: Ib7278432e8564c0123c64cdc4934f280e528e687
This commit is contained in:
Xiangyu/Malcolm Chen
2020-01-08 16:08:26 -08:00
committed by android-build-merger
parent cd6845de02 939d3d62cd
commit 69804facae
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -8761,6 +8761,7 @@ package android.telephony {
} }
public class ServiceState implements android.os.Parcelable { public class ServiceState implements android.os.Parcelable {
method @NonNull public android.telephony.ServiceState createLocationInfoSanitizedCopy(boolean);
method public int getDataRegistrationState(); method public int getDataRegistrationState();
method @Nullable public android.telephony.NetworkRegistrationInfo getNetworkRegistrationInfo(int, int); method @Nullable public android.telephony.NetworkRegistrationInfo getNetworkRegistrationInfo(int, int);
method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoList(); method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoList();

10
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -788,9 +788,11 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) { if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
r.callback.onServiceStateChanged(rawSs); r.callback.onServiceStateChanged(rawSs);
} else if (checkCoarseLocationAccess(r, Build.VERSION_CODES.Q)) { } else if (checkCoarseLocationAccess(r, Build.VERSION_CODES.Q)) {
r.callback.onServiceStateChanged(rawSs.sanitizeLocationInfo(false)); r.callback.onServiceStateChanged(
rawSs.createLocationInfoSanitizedCopy(false));
} else { } else {
r.callback.onServiceStateChanged(rawSs.sanitizeLocationInfo(true)); r.callback.onServiceStateChanged(
rawSs.createLocationInfoSanitizedCopy(true));
} }
} catch (RemoteException ex) { } catch (RemoteException ex) {
remove(r.binder); remove(r.binder);
@@ -1146,9 +1148,9 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) { if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
stateToSend = new ServiceState(state); stateToSend = new ServiceState(state);
} else if (checkCoarseLocationAccess(r, Build.VERSION_CODES.Q)) { } else if (checkCoarseLocationAccess(r, Build.VERSION_CODES.Q)) {
stateToSend = state.sanitizeLocationInfo(false); stateToSend = state.createLocationInfoSanitizedCopy(false);
} else { } else {
stateToSend = state.sanitizeLocationInfo(true); stateToSend = state.createLocationInfoSanitizedCopy(true);
} }
if (DBG) { if (DBG) {
log("notifyServiceStateForSubscriber: callback.onSSC r=" + r log("notifyServiceStateForSubscriber: callback.onSSC r=" + r

11
telephony/java/android/telephony/ServiceState.java
View File

@@ -1950,9 +1950,18 @@ public class ServiceState implements Parcelable {
* Returns a copy of self with location-identifying information removed. * Returns a copy of self with location-identifying information removed.
* Always clears the NetworkRegistrationInfo's CellIdentity fields, but if removeCoarseLocation * Always clears the NetworkRegistrationInfo's CellIdentity fields, but if removeCoarseLocation
* is true, clears other info as well. * is true, clears other info as well.
*
* @param removeCoarseLocation Whether to also remove coarse location information.
* if false, it only clears fine location information such as
* NetworkRegistrationInfo's CellIdentity fields; If true, it will
* also remove other location information such as operator's MCC
* and MNC.
* @return the copied ServiceState with location info sanitized.
* @hide * @hide
*/ */
public ServiceState sanitizeLocationInfo(boolean removeCoarseLocation) { @SystemApi
@NonNull
public ServiceState createLocationInfoSanitizedCopy(boolean removeCoarseLocation) {
ServiceState state = new ServiceState(this); ServiceState state = new ServiceState(this);
synchronized (state.mNetworkRegistrationInfos) { synchronized (state.mNetworkRegistrationInfos) {
List<NetworkRegistrationInfo> networkRegistrationInfos = List<NetworkRegistrationInfo> networkRegistrationInfos =