commit 30b68dbdf73d9bf7295f49a0e6bd7b4361a494ce
author Yorke Lee <yorkelee@google.com> Thu Sep 25 18:05:22 2014 -0700
committer Yorke Lee <yorkelee@google.com> Fri Sep 26 12:23:32 2014 -0700
tree 879e5efda9a0b12c145d687a030c18eec7789c72
parent 5d06942b85ae1b559fa2af73ab633da5f79a8934

Perform CDMA provisioning at bootup if OTASP_NEEDED

* Also move the check for TelephonyCapabilities.supportOtasp to after
the point where STATE_IN_SERVICE is true, otherwise it always returns
false, probably because we don't know whether the phone is GSM/CDMA
at that point in time.

* Update theme of activation dialog to Material

Bug: 15072417
Change-Id: Ieb8157fb57d622955292e585b3918a588ef62d50

src/com/android/phone/HfaActivity.java

diff --git a/src/com/android/phone/HfaActivity.java b/src/com/android/phone/HfaActivity.java
index bcd3652..b526d46 100644
--- a/src/com/android/phone/HfaActivity.java
+++ b/src/com/android/phone/HfaActivity.java
@@ -81,7 +81,7 @@
     }
 
     private void buildAndShowDialog() {
-        mDialog = new AlertDialog.Builder(this)
+        mDialog = new AlertDialog.Builder(this, AlertDialog.THEME_DEVICE_DEFAULT_LIGHT)
                 .setTitle(R.string.ota_hfa_activation_title)
                 .setMessage(R.string.ota_hfa_activation_dialog_message)
                 .setPositiveButton(R.string.ota_skip_activation_dialog_skip_label,
@@ -108,7 +108,8 @@
     private void onHfaError(String errorMsg) {
         mDialog.dismiss();
 
-        AlertDialog errorDialog = new AlertDialog.Builder(this)
+        AlertDialog errorDialog = new AlertDialog.Builder(this,
+                AlertDialog.THEME_DEVICE_DEFAULT_LIGHT)
             .setMessage(errorMsg)
             .setPositiveButton(R.string.ota_skip_activation_dialog_skip_label,
                     new DialogInterface.OnClickListener() {