Merge "Abort NetworkScans when Phone Process Crashes" am: ed7cf992a0 am: e78ea75efe (5bbd69c4) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyScanManager.java

+67 −17

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.os.Parcelable;
		import android.os.RemoteException;
		import android.util.SparseArray;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.telephony.ITelephony;
		import com.android.telephony.Rlog;

		@@ -55,6 +56,8 @@ public final class TelephonyScanManager {
		public static final int CALLBACK_SCAN_COMPLETE = 3;
		/** @hide */
		public static final int CALLBACK_RESTRICTED_SCAN_RESULTS = 4;
		/** @hide */
		public static final int CALLBACK_TELEPHONY_DIED = 5;

		/** @hide */
		public static final int INVALID_SCAN_ID = -1;
		@@ -103,17 +106,44 @@ public final class TelephonyScanManager {
		}

		private final Looper mLooper;
		private final Handler mHandler;
		private final Messenger mMessenger;
		private final SparseArray<NetworkScanInfo> mScanInfo = new SparseArray<NetworkScanInfo>();
		private final Binder.DeathRecipient mDeathRecipient;

		public TelephonyScanManager() {
		HandlerThread thread = new HandlerThread(TAG);
		thread.start();
		mLooper = thread.getLooper();
		mMessenger = new Messenger(new Handler(mLooper) {
		mHandler = new Handler(mLooper) {
		@Override
		public void handleMessage(Message message) {
		checkNotNull(message, "message cannot be null");
		if (message.what == CALLBACK_TELEPHONY_DIED) {
		// If there are no objects in mScanInfo then binder death will simply return.
		synchronized (mScanInfo) {
		for (int i = 0; i < mScanInfo.size(); i++) {
		NetworkScanInfo nsi = mScanInfo.valueAt(i);
		// At this point we go into panic mode and ignore errors that would
		// normally stop the show in order to try and clean up as gracefully
		// as possible.
		if (nsi == null) continue; // shouldn't be possible
		Executor e = nsi.mExecutor;
		NetworkScanCallback cb = nsi.mCallback;
		if (e == null \|\| cb == null) continue;
		try {
		e.execute(
		() -> cb.onError(NetworkScan.ERROR_MODEM_UNAVAILABLE));
		} catch (java.util.concurrent.RejectedExecutionException ignore) {
		// ignore so that we can continue
		}
		}

		mScanInfo.clear();
		}
		return;
		}

		NetworkScanInfo nsi;
		synchronized (mScanInfo) {
		nsi = mScanInfo.get(message.arg2);
		@@ -158,6 +188,9 @@ public final class TelephonyScanManager {
		Rlog.d(TAG, "onError: " + errorCode);
		callback.onError(errorCode);
		});
		synchronized (mScanInfo) {
		mScanInfo.remove(message.arg2);
		}
		} catch (Exception e) {
		Rlog.e(TAG, "Exception in networkscan callback onError", e);
		}
		@@ -168,7 +201,9 @@ public final class TelephonyScanManager {
		Rlog.d(TAG, "onComplete");
		callback.onComplete();
		});
		synchronized (mScanInfo) {
		mScanInfo.remove(message.arg2);
		}
		} catch (Exception e) {
		Rlog.e(TAG, "Exception in networkscan callback onComplete", e);
		}
		@@ -178,7 +213,14 @@ public final class TelephonyScanManager {
		break;
		}
		}
		});
		};
		mMessenger = new Messenger(mHandler);
		mDeathRecipient = new Binder.DeathRecipient() {
		@Override
		public void binderDied() {
		mHandler.obtainMessage(CALLBACK_TELEPHONY_DIED).sendToTarget();
		}
		};
		}

		/**
		@@ -189,7 +231,7 @@ public final class TelephonyScanManager {
		*
		* <p>
		* Requires Permission:
		* {@link android.Manifest.permission#ACCESS_COARSE_LOCATION} and
		* {@link android.Manifest.permission#ACCESS_FINE_LOCATION} and
		* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
		* Or the calling app has carrier privileges. @see #hasCarrierPrivileges
		*
		@@ -204,9 +246,9 @@ public final class TelephonyScanManager {
		NetworkScanRequest request, Executor executor, NetworkScanCallback callback,
		String callingPackage, @Nullable String callingFeatureId) {
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null) {
		synchronized (mScanInfo) {
		final ITelephony telephony = getITelephony();
		if (telephony == null) return null;

		int scanId = telephony.requestNetworkScan(
		subId, request, mMessenger, new Binder(), callingPackage,
		callingFeatureId);
		@@ -214,10 +256,17 @@ public final class TelephonyScanManager {
		Rlog.e(TAG, "Failed to initiate network scan");
		return null;
		}
		synchronized (mScanInfo) {
		// We link to death whenever a scan is started to ensure that we are linked
		// at the point that phone process death might matter.
		// We never unlink because:
		// - Duplicate links to death with the same callback do not result in
		// extraneous callbacks (the tracking de-dupes).
		// - Receiving binderDeath() when no scans are active is a no-op.
		telephony.asBinder().linkToDeath(mDeathRecipient, 0);
		saveScanInfo(scanId, request, executor, callback);
		return new NetworkScan(scanId, subId);
		}
		}
		} catch (RemoteException ex) {
		Rlog.e(TAG, "requestNetworkScan RemoteException", ex);
		} catch (NullPointerException ex) {
		@@ -226,6 +275,7 @@ public final class TelephonyScanManager {
		return null;
		}

		@GuardedBy("mScanInfo")
		private void saveScanInfo(
		int id, NetworkScanRequest request, Executor executor, NetworkScanCallback callback) {
		mScanInfo.put(id, new NetworkScanInfo(request, executor, callback));