Merge "checkMobileProvisioning is not using sendNotification." (71795c73) · Commits · e / os / android_frameworks_base

services/java/com/android/server/ConnectivityService.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -3670,7 +3670,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		}

		@Override
		public int checkMobileProvisioning(boolean sendNotification, int suggestedTimeOutMs,
		public int checkMobileProvisioning(final boolean sendNotification, int suggestedTimeOutMs,
		final ResultReceiver resultReceiver) {
		log("checkMobileProvisioning: E sendNotification=" + sendNotification
		+ " suggestedTimeOutMs=" + suggestedTimeOutMs
		@@ -3703,6 +3703,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		log("CheckMp.onComplete: send result");
		resultReceiver.send(result, null);
		}
		if (!sendNotification) {
		log("CheckMp.onComplete: done, not sending notification");
		return;
		}
		NetworkInfo ni =
		mNetTrackers[ConnectivityManager.TYPE_MOBILE_HIPRI].getNetworkInfo();
		switch(result) {