commit 209c9465b3251c0a5e652214e402b1a54df234f9
author PauloftheWest <paulofthewest@google.com> Thu Dec 11 13:14:06 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 11 13:14:07 2014 +0000
tree a263325ba5e63f5cd2f0776143b25b28da0602f1
parent ab88ad9381dda4afe59d00966cb783426f5f44a3
parent 5b3da0cc30f0b90eca0321a5d9cdf5f6abdf9760

Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev

src/com/android/settings/sim/SimBootReceiver.java

diff --git a/src/com/android/settings/sim/SimBootReceiver.java b/src/com/android/settings/sim/SimBootReceiver.java
index 213a585..3b3489e 100644
--- a/src/com/android/settings/sim/SimBootReceiver.java
+++ b/src/com/android/settings/sim/SimBootReceiver.java
@@ -27,6 +27,7 @@
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.res.Resources;
+import android.provider.Settings;
 import android.support.v4.app.NotificationCompat;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
@@ -62,12 +63,14 @@
 
     private void detectChangeAndNotify() {
         final int numSlots = mTelephonyManager.getSimCount();
+        final boolean isInProvisioning = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.DEVICE_PROVISIONED, 0) == 0;
         boolean notificationSent = false;
         int numSIMsDetected = 0;
         int lastSIMSlotDetected = -1;
 
-        // Do not create notifications on single SIM devices.
-        if (numSlots < 2) {
+        // Do not create notifications on single SIM devices or when provisiong.
+        if (numSlots < 2 || isInProvisioning) {
             return;
         }