Merge "Improve location checks in TelephonyRegistry" (b7e0722f) · Commits · e / os / android_frameworks_base

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

+30 −22

Original line number	Diff line number	Diff line
		@@ -315,11 +315,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		private List<Map<Pair<Integer, ApnSetting>, PreciseDataConnectionState>>
		mPreciseDataConnectionStates;

		static final int ENFORCE_COARSE_LOCATION_PERMISSION_MASK =
		PhoneStateListener.LISTEN_REGISTRATION_FAILURE
		\| PhoneStateListener.LISTEN_BARRING_INFO;

		static final int ENFORCE_FINE_LOCATION_PERMISSION_MASK =
		// Starting in Q, almost all cellular location requires FINE location enforcement.
		// Prior to Q, cellular was available with COARSE location enforcement. Bits in this
		// list will be checked for COARSE on apps targeting P or earlier and FINE on Q or later.
		static final int ENFORCE_LOCATION_PERMISSION_MASK =
		PhoneStateListener.LISTEN_CELL_LOCATION
		\| PhoneStateListener.LISTEN_CELL_INFO
		\| PhoneStateListener.LISTEN_REGISTRATION_FAILURE
		@@ -376,7 +375,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		+ " newDefaultPhoneId=" + newDefaultPhoneId);
		}

		//Due to possible risk condition,(notify call back using the new
		//Due to possible race condition,(notify call back using the new
		//defaultSubId comes before new defaultSubId update) we need to recall all
		//possible missed notify callback
		synchronized (mRecords) {
		@@ -909,7 +908,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		if (validateEventsAndUserLocked(r, PhoneStateListener.LISTEN_CELL_LOCATION)) {
		try {
		if (DBG_LOC) log("listen: mCellIdentity = " + mCellIdentity[phoneId]);
		if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		if (checkCoarseLocationAccess(r, Build.VERSION_CODES.BASE)
		&& checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		// null will be translated to empty CellLocation object in client.
		r.callback.onCellLocationChanged(mCellIdentity[phoneId]);
		}
		@@ -964,7 +964,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		try {
		if (DBG_LOC) log("listen: mCellInfo[" + phoneId + "] = "
		+ mCellInfo.get(phoneId));
		if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		if (checkCoarseLocationAccess(r, Build.VERSION_CODES.BASE)
		&& checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		r.callback.onCellInfoChanged(mCellInfo.get(phoneId));
		}
		} catch (RemoteException ex) {
		@@ -1518,7 +1519,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		for (Record r : mRecords) {
		if (validateEventsAndUserLocked(r, PhoneStateListener.LISTEN_CELL_INFO) &&
		idMatch(r.subId, subId, phoneId) &&
		checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		(checkCoarseLocationAccess(r, Build.VERSION_CODES.BASE)
		&& checkFineLocationAccess(r, Build.VERSION_CODES.Q))) {
		try {
		if (DBG_LOC) {
		log("notifyCellInfoForSubscriber: mCellInfo=" + cellInfo
		@@ -1797,7 +1799,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		for (Record r : mRecords) {
		if (validateEventsAndUserLocked(r, PhoneStateListener.LISTEN_CELL_LOCATION) &&
		idMatch(r.subId, subId, phoneId) &&
		checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		(checkCoarseLocationAccess(r, Build.VERSION_CODES.BASE)
		&& checkFineLocationAccess(r, Build.VERSION_CODES.Q))) {
		try {
		if (DBG_LOC) {
		log("notifyCellLocation: cellLocation=" + cellLocation
		@@ -2544,16 +2547,11 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {

		boolean shouldCheckLocationPermissions = false;

		if ((events & ENFORCE_FINE_LOCATION_PERMISSION_MASK) != 0) {
		if ((events & ENFORCE_LOCATION_PERMISSION_MASK) != 0) {
		// Everything that requires fine location started in Q. So far...
		locationQueryBuilder.setMinSdkVersionForFine(Build.VERSION_CODES.Q);
		// If we're enforcing fine starting in Q, we also want to enforce coarse starting in Q.
		locationQueryBuilder.setMinSdkVersionForCoarse(Build.VERSION_CODES.Q);
		locationQueryBuilder.setMinSdkVersionForEnforcement(Build.VERSION_CODES.Q);
		shouldCheckLocationPermissions = true;
		}

		if ((events & ENFORCE_COARSE_LOCATION_PERMISSION_MASK) != 0) {
		// If we're enforcing fine starting in Q, we also want to enforce coarse even for
		// older SDK versions.
		locationQueryBuilder.setMinSdkVersionForCoarse(0);
		locationQueryBuilder.setMinSdkVersionForEnforcement(0);
		shouldCheckLocationPermissions = true;
		@@ -2750,8 +2748,16 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		try {
		if (VDBG) log("checkPossibleMissNotify: onServiceStateChanged state=" +
		mServiceState[phoneId]);
		ServiceState ss = new ServiceState(mServiceState[phoneId]);
		if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		r.callback.onServiceStateChanged(ss);
		} else if (checkCoarseLocationAccess(r, Build.VERSION_CODES.Q)) {
		r.callback.onServiceStateChanged(
		ss.createLocationInfoSanitizedCopy(false));
		} else {
		r.callback.onServiceStateChanged(
		new ServiceState(mServiceState[phoneId]));
		ss.createLocationInfoSanitizedCopy(true));
		}
		} catch (RemoteException ex) {
		mRemoveList.add(r.binder);
		}
		@@ -2796,7 +2802,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		log("checkPossibleMissNotify: onCellInfoChanged[" + phoneId + "] = "
		+ mCellInfo.get(phoneId));
		}
		if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		if (checkCoarseLocationAccess(r, Build.VERSION_CODES.BASE)
		&& checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		r.callback.onCellInfoChanged(mCellInfo.get(phoneId));
		}
		} catch (RemoteException ex) {
		@@ -2862,7 +2869,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		log("checkPossibleMissNotify: onCellLocationChanged mCellIdentity = "
		+ mCellIdentity[phoneId]);
		}
		if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		if (checkCoarseLocationAccess(r, Build.VERSION_CODES.BASE)
		&& checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {
		// null will be translated to empty CellLocation object in client.
		r.callback.onCellLocationChanged(mCellIdentity[phoneId]);
		}