Merge "checkMobileProvisioning is not using sendNotification."

2013-07-19 17:12:39 +00:00
parent 98b10cec42 99fedebaa1
commit c2d87fb435
1 changed files with 5 additions and 1 deletions
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -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) {