commit 35cc03489b8fd38c0415386deef278f3dfe8ce12
author Ta-wei Yen <twyen@google.com> Wed Jul 20 10:40:20 2016 -0700
committer Ta-wei Yen <twyen@google.com> Wed Jul 20 10:40:20 2016 -0700
tree 97c4d6855abfb0c1b7c502079b05504ec10d7394
parent 9c59fc908359818c581404aea79589d7385d79fc

Postpone VVM activation until the setup wizard has finished

Visual voicemail activation might need information such as system
language to be set, so it should wait for the setup wizard to be
finished before activating.

Change-Id: I126c823c958e7e7c856ee859122d78953f023d5a
Fixes: 30229420

src/com/android/phone/vvm/omtp/ActivationTask.java

diff --git a/src/com/android/phone/vvm/omtp/ActivationTask.java b/src/com/android/phone/vvm/omtp/ActivationTask.java
index 101a96f..c2aa76b 100644
--- a/src/com/android/phone/vvm/omtp/ActivationTask.java
+++ b/src/com/android/phone/vvm/omtp/ActivationTask.java
@@ -20,7 +20,10 @@
 import android.annotation.WorkerThread;
 import android.content.Context;
 import android.content.Intent;
+import android.database.ContentObserver;
 import android.os.Bundle;
+import android.provider.Settings;
+import android.provider.Settings.Global;
 import android.telecom.PhoneAccountHandle;
 import com.android.phone.Assert;
 import com.android.phone.PhoneGlobals;
@@ -34,6 +37,8 @@
 import com.android.phone.vvm.omtp.sync.SyncTask;
 import com.android.phone.vvm.omtp.utils.PhoneAccountHandleConverter;
 import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
@@ -46,13 +51,16 @@
  */
 public class ActivationTask extends BaseTask {
 
-    private static final String TAG = "ActivationTask";
+    private static final String TAG = "VvmActivationTask";
 
     private static final int RETRY_TIMES = 4;
     private static final int RETRY_INTERVAL_MILLIS = 5_000;
 
     private static final String EXTRA_MESSAGE_DATA_BUNDLE = "extra_message_data_bundle";
 
+    @Nullable
+    private static DeviceProvisionedObserver sDeviceProvisionedObserver;
+
     private Bundle mData;
 
     public ActivationTask() {
@@ -60,7 +68,24 @@
         addPolicy(new RetryPolicy(RETRY_TIMES, RETRY_INTERVAL_MILLIS));
     }
 
+    /**
+     * Has the user gone through the setup wizard yet.
+     */
+    private static boolean isDeviceProvisioned(Context context) {
+        return Settings.Global.getInt(
+            context.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 0) == 1;
+    }
+
     public static void start(Context context, int subId, @Nullable Bundle data) {
+        if (!isDeviceProvisioned(context)) {
+            VvmLog.i(TAG, "Activation requested while device is not provisioned, postponing");
+            // Activation might need information such as system language to be set, so wait until
+            // the setup wizard is finished. The data bundle from the SMS will be re-requested upon
+            // activation.
+            queueActivationAfterProvisioned(context, subId);
+            return;
+        }
+
         Intent intent = BaseTask.createIntent(context, ActivationTask.class, subId);
         if (data != null) {
             intent.putExtra(EXTRA_MESSAGE_DATA_BUNDLE, data);
@@ -163,4 +188,41 @@
             VvmLog.e(TAG, "Visual voicemail not available for subscriber.");
         }
     }
+
+    private static void queueActivationAfterProvisioned(Context context, int subId) {
+        if (sDeviceProvisionedObserver == null) {
+            sDeviceProvisionedObserver = new DeviceProvisionedObserver(context);
+            context.getContentResolver()
+                .registerContentObserver(Settings.Global.getUriFor(Global.DEVICE_PROVISIONED),
+                    false, sDeviceProvisionedObserver);
+        }
+        sDeviceProvisionedObserver.addSubId(subId);
+    }
+
+    private static class DeviceProvisionedObserver extends ContentObserver {
+
+        private final Context mContext;
+        private final Set<Integer> mSubIds = new HashSet<>();
+
+        private DeviceProvisionedObserver(Context context) {
+            super(null);
+            mContext = context;
+        }
+
+        public void addSubId(int subId) {
+            mSubIds.add(subId);
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            if (isDeviceProvisioned(mContext)) {
+                VvmLog.i(TAG, "device provisioned, resuming activation");
+                for (int subId : mSubIds) {
+                    start(mContext, subId, null);
+                }
+                mContext.getContentResolver().unregisterContentObserver(sDeviceProvisionedObserver);
+                sDeviceProvisionedObserver = null;
+            }
+        }
+    }
 }