Merge "Implement more location checks" (a3aae9fe) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -43018,12 +43018,12 @@ package android.telephony {
		method public boolean canChangeDtmfToneLength();
		method @Nullable public android.telephony.TelephonyManager createForPhoneAccountHandle(android.telecom.PhoneAccountHandle);
		method public android.telephony.TelephonyManager createForSubscriptionId(int);
		method @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) public java.util.List<android.telephony.CellInfo> getAllCellInfo();
		method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public java.util.List<android.telephony.CellInfo> getAllCellInfo();
		method public int getCallState();
		method public int getCardIdForDefaultEuicc();
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @WorkerThread public android.os.PersistableBundle getCarrierConfig();
		method public int getCarrierIdFromSimMccMnc();
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public android.telephony.CellLocation getCellLocation();
		method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public android.telephony.CellLocation getCellLocation();
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @Nullable public java.util.Map<java.lang.Integer,java.util.List<android.telephony.emergency.EmergencyNumber>> getCurrentEmergencyNumberList();
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @Nullable public java.util.Map<java.lang.Integer,java.util.List<android.telephony.emergency.EmergencyNumber>> getCurrentEmergencyNumberList(int);
		method public int getDataActivity();
		@@ -43053,7 +43053,7 @@ package android.telephony {
		method public int getPhoneCount();
		method public int getPhoneType();
		method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PHONE_STATE}) public int getPreferredOpportunisticDataSubscription();
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telephony.ServiceState getServiceState();
		method @RequiresPermission(allOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public android.telephony.ServiceState getServiceState();
		method @Nullable public android.telephony.SignalStrength getSignalStrength();
		method public int getSimCarrierId();
		method @Nullable public CharSequence getSimCarrierIdName();
		@@ -43095,8 +43095,8 @@ package android.telephony {
		method public boolean isVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle);
		method public boolean isWorldPhone();
		method public void listen(android.telephony.PhoneStateListener, int);
		method @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) public void requestCellInfoUpdate(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, java.util.concurrent.Executor, android.telephony.TelephonyScanManager.NetworkScanCallback);
		method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestCellInfoUpdate(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback);
		method @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, java.util.concurrent.Executor, android.telephony.TelephonyScanManager.NetworkScanCallback);
		method public void sendDialerSpecialCode(String);
		method public String sendEnvelopeWithStatus(String);
		method @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void sendUssdRequest(String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler);

api/removed.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -540,7 +540,7 @@ package android.telephony {

		public class TelephonyManager {
		method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) public java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, android.telephony.TelephonyScanManager.NetworkScanCallback);
		method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, android.telephony.TelephonyScanManager.NetworkScanCallback);
		}

		}

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -6377,7 +6377,7 @@ package android.telephony {
		method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);
		method public boolean needsOtaServiceProvisioning();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean rebootRadio();
		method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.MODIFY_PHONE_STATE}) public void requestCellInfoUpdate(@NonNull android.os.WorkSource, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback);
		method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.MODIFY_PHONE_STATE}) public void requestCellInfoUpdate(@NonNull android.os.WorkSource, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void requestNumberVerification(@NonNull android.telephony.PhoneNumberRange, long, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.NumberVerificationCallback);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean resetRadioConfig();
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>);

services/core/java/com/android/server/TelephonyRegistry.java

+89 −24

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.content.pm.PackageManager;
		import android.net.LinkProperties;
		import android.net.NetworkCapabilities;
		import android.os.Binder;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.IBinder;
		@@ -246,7 +247,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		private PreciseDataConnectionState mPreciseDataConnectionState =
		new PreciseDataConnectionState();

		static final int ENFORCE_COARSE_LOCATION_PERMISSION_MASK =
		// Nothing here yet, but putting it here in case we want to add more in the future.
		static final int ENFORCE_COARSE_LOCATION_PERMISSION_MASK = 0;

		static final int ENFORCE_FINE_LOCATION_PERMISSION_MASK =
		PhoneStateListener.LISTEN_CELL_LOCATION
		\| PhoneStateListener.LISTEN_CELL_INFO;

		@@ -637,8 +641,14 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		if ((events & PhoneStateListener.LISTEN_SERVICE_STATE) != 0) {
		try {
		if (VDBG) log("listen: call onSSC state=" + mServiceState[phoneId]);
		r.callback.onServiceStateChanged(
		new ServiceState(mServiceState[phoneId]));
		ServiceState rawSs = new ServiceState(mServiceState[phoneId]);
		if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		r.callback.onServiceStateChanged(rawSs);
		} else if (checkCoarseLocationAccess(r, Build.VERSION_CODES.Q)) {
		r.callback.onServiceStateChanged(rawSs.sanitizeLocationInfo(false));
		} else {
		r.callback.onServiceStateChanged(rawSs.sanitizeLocationInfo(true));
		}
		} catch (RemoteException ex) {
		remove(r.binder);
		}
		@@ -673,7 +683,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		try {
		if (DBG_LOC) log("listen: mCellLocation = "
		+ mCellLocation[phoneId]);
		if (checkLocationAccess(r)) {
		if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		r.callback.onCellLocationChanged(
		new Bundle(mCellLocation[phoneId]));
		}
		@@ -722,7 +732,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		try {
		if (DBG_LOC) log("listen: mCellInfo[" + phoneId + "] = "
		+ mCellInfo.get(phoneId));
		if (checkLocationAccess(r)) {
		if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		r.callback.onCellInfoChanged(mCellInfo.get(phoneId));
		}
		} catch (RemoteException ex) {
		@@ -1009,13 +1019,22 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		}
		if (r.matchPhoneStateListenerEvent(PhoneStateListener.LISTEN_SERVICE_STATE) &&
		idMatch(r.subId, subId, phoneId)) {

		try {
		ServiceState stateToSend;
		if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		stateToSend = new ServiceState(state);
		} else if (checkCoarseLocationAccess(r, Build.VERSION_CODES.Q)) {
		stateToSend = state.sanitizeLocationInfo(false);
		} else {
		stateToSend = state.sanitizeLocationInfo(true);
		}
		if (DBG) {
		log("notifyServiceStateForSubscriber: callback.onSSC r=" + r
		+ " subId=" + subId + " phoneId=" + phoneId
		+ " state=" + state);
		}
		r.callback.onServiceStateChanged(new ServiceState(state));
		r.callback.onServiceStateChanged(stateToSend);
		} catch (RemoteException ex) {
		mRemoveList.add(r.binder);
		}
		@@ -1198,7 +1217,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		for (Record r : mRecords) {
		if (validateEventsAndUserLocked(r, PhoneStateListener.LISTEN_CELL_INFO) &&
		idMatch(r.subId, subId, phoneId) &&
		checkLocationAccess(r)) {
		checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		try {
		if (DBG_LOC) {
		log("notifyCellInfo: mCellInfo=" + cellInfo + " r=" + r);
		@@ -1500,7 +1519,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		for (Record r : mRecords) {
		if (validateEventsAndUserLocked(r, PhoneStateListener.LISTEN_CELL_LOCATION) &&
		idMatch(r.subId, subId, phoneId) &&
		checkLocationAccess(r)) {
		checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		try {
		if (DBG_LOC) {
		log("notifyCellLocation: cellLocation=" + cellLocation
		@@ -2109,11 +2128,34 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {

		private boolean checkListenerPermission(
		int events, int subId, String callingPackage, String message) {
		LocationAccessPolicy.LocationPermissionQuery.Builder locationQueryBuilder =
		new LocationAccessPolicy.LocationPermissionQuery.Builder()
		.setCallingPackage(callingPackage)
		.setMethod(message + " events: " + events)
		.setCallingPid(Binder.getCallingPid())
		.setCallingUid(Binder.getCallingUid());

		boolean shouldCheckLocationPermissions = false;
		if ((events & ENFORCE_COARSE_LOCATION_PERMISSION_MASK) != 0) {
		mContext.enforceCallingOrSelfPermission(
		android.Manifest.permission.ACCESS_COARSE_LOCATION, null);
		if (mAppOps.noteOp(AppOpsManager.OP_COARSE_LOCATION, Binder.getCallingUid(),
		callingPackage) != AppOpsManager.MODE_ALLOWED) {
		locationQueryBuilder.setMinSdkVersionForCoarse(0);
		shouldCheckLocationPermissions = true;
		}

		if ((events & ENFORCE_FINE_LOCATION_PERMISSION_MASK) != 0) {
		// Everything that requires fine location started in Q. So far...
		locationQueryBuilder.setMinSdkVersionForFine(Build.VERSION_CODES.Q);
		shouldCheckLocationPermissions = true;
		}

		if (shouldCheckLocationPermissions) {
		LocationAccessPolicy.LocationPermissionResult result =
		LocationAccessPolicy.checkLocationPermission(
		mContext, locationQueryBuilder.build());
		switch (result) {
		case DENIED_HARD:
		throw new SecurityException("Unable to listen for events " + events + " due to "
		+ "insufficient location permissions.");
		case DENIED_SOFT:
		return false;
		}
		}
		@@ -2229,15 +2271,38 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		}
		}

		private boolean checkLocationAccess(Record r) {
		long token = Binder.clearCallingIdentity();
		try {
		return LocationAccessPolicy.canAccessCellLocation(mContext,
		r.callingPackage, r.callerUid, r.callerPid,
		/throwOnDeniedPermission/ false);
		} finally {
		Binder.restoreCallingIdentity(token);
		private boolean checkFineLocationAccess(Record r, int minSdk) {
		LocationAccessPolicy.LocationPermissionQuery query =
		new LocationAccessPolicy.LocationPermissionQuery.Builder()
		.setCallingPackage(r.callingPackage)
		.setCallingPid(r.callerPid)
		.setCallingUid(r.callerUid)
		.setMethod("TelephonyRegistry push")
		.setMinSdkVersionForFine(minSdk)
		.build();

		return Binder.withCleanCallingIdentity(() -> {
		LocationAccessPolicy.LocationPermissionResult locationResult =
		LocationAccessPolicy.checkLocationPermission(mContext, query);
		return locationResult == LocationAccessPolicy.LocationPermissionResult.ALLOWED;
		});
		}

		private boolean checkCoarseLocationAccess(Record r, int minSdk) {
		LocationAccessPolicy.LocationPermissionQuery query =
		new LocationAccessPolicy.LocationPermissionQuery.Builder()
		.setCallingPackage(r.callingPackage)
		.setCallingPid(r.callerPid)
		.setCallingUid(r.callerUid)
		.setMethod("TelephonyRegistry push")
		.setMinSdkVersionForCoarse(minSdk)
		.build();

		return Binder.withCleanCallingIdentity(() -> {
		LocationAccessPolicy.LocationPermissionResult locationResult =
		LocationAccessPolicy.checkLocationPermission(mContext, query);
		return locationResult == LocationAccessPolicy.LocationPermissionResult.ALLOWED;
		});
		}

		private void checkPossibleMissNotify(Record r, int phoneId) {
		@@ -2287,7 +2352,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		log("checkPossibleMissNotify: onCellInfoChanged[" + phoneId + "] = "
		+ mCellInfo.get(phoneId));
		}
		if (checkLocationAccess(r)) {
		if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		r.callback.onCellInfoChanged(mCellInfo.get(phoneId));
		}
		} catch (RemoteException ex) {
		@@ -2337,7 +2402,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		try {
		if (DBG_LOC) log("checkPossibleMissNotify: onCellLocationChanged mCellLocation = "
		+ mCellLocation[phoneId]);
		if (checkLocationAccess(r)) {
		if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		r.callback.onCellLocationChanged(new Bundle(mCellLocation[phoneId]));
		}
		} catch (RemoteException ex) {

telephony/java/android/telephony/LocationAccessPolicy.java

+242 −52

File changed.

Preview size limit exceeded, changes collapsed.