commit 5c386e8018824c4d352e4c7d9f8062c22ca33797
author David Brown <dab@google.com> Fri Sep 09 13:59:26 2011 -0700
committer David Brown <dab@google.com> Fri Sep 09 15:24:32 2011 -0700
tree a52542747ee43aa9c7792d9407e1f9d5875d9159
parent b2ef6d867be77f69b5ff7e5fb427007c024a9c84

Fix crash with MMI code *#06#

The code was calling getWindow().setType() on the IMEI dialog *after*
showing it.  The code had been doing that all along, but starting about a
week ago (change Iac63da) the framework now also throws an exception if
you do that :-(

Turns out there's no need to set TYPE_PRIORITY_PHONE in this case anyway,
since the dialer UI can't run on top of the keyguard in the first place
(and the contacts app doesn't have the SYSTEM_ALERT_WINDOW permission
anyway.)  So just remove the offending call.

(Note there's also a corresponding fix under apps/Phone for this same
issue.  Also, I double-checked all the *other* Window.setType() calls in
Phone and Contacts, and we don't have this same problem anywhere else.)

TESTED: Launch dialer, dial "*#06#": IMEI panel correctly comes up.

Bug: 5279270

Change-Id: Ie19ec1414fc6096ee2c84fe716259304bff7a33b

src/com/android/contacts/SpecialCharSequenceMgr.java

diff --git a/src/com/android/contacts/SpecialCharSequenceMgr.java b/src/com/android/contacts/SpecialCharSequenceMgr.java
index 9f9f40d..b5deab8 100644
--- a/src/com/android/contacts/SpecialCharSequenceMgr.java
+++ b/src/com/android/contacts/SpecialCharSequenceMgr.java
@@ -42,6 +42,10 @@
  * Helper class to listen for some magic character sequences
  * that are handled specially by the dialer.
  *
+ * Note the Phone app also handles these sequences too (in a couple of
+ * relativly obscure places in the UI), so there's a separate version of
+ * this class under apps/Phone.
+ *
  * TODO: there's lots of duplicated code between this class and the
  * corresponding class under apps/Phone.  Let's figure out a way to
  * unify these two classes (in the framework? in a common shared library?)
@@ -198,6 +202,12 @@
         return false;
     }
 
+    // TODO: Combine showIMEIPanel() and showMEIDPanel() into a single
+    // generic "showDeviceIdPanel()" method, like in the apps/Phone
+    // version of SpecialCharSequenceMgr.java.  (This will require moving
+    // the phone app's TelephonyCapabilities.getDeviceIdLabel() method
+    // into the telephony framework, though.)
+
     static void showIMEIPanel(Context context, boolean useSystemWindow) {
         String imeiStr = ((TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE))
                 .getDeviceId();
@@ -208,7 +218,6 @@
                 .setPositiveButton(android.R.string.ok, null)
                 .setCancelable(false)
                 .show();
-        alert.getWindow().setType(WindowManager.LayoutParams.TYPE_PRIORITY_PHONE);
     }
 
     static void showMEIDPanel(Context context, boolean useSystemWindow) {
@@ -221,7 +230,6 @@
                 .setPositiveButton(android.R.string.ok, null)
                 .setCancelable(false)
                 .show();
-        alert.getWindow().setType(WindowManager.LayoutParams.TYPE_PRIORITY_PHONE);
     }
 
     /*******