commit f2c37bf718df8360e9a91c58d8f639991680266b
author Nancy Chen <nancychen@google.com> Tue May 12 16:57:34 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 12 16:59:39 2015 +0000
tree 68c83c2c3dd8add380b784bf8d4fa88d5ab2dacc
parent 5173e266dd0cc500d8d7e066ea603330d0d49830
parent 5f18375e2f47a3d115c4d9e1637c2173663cb848

Merge "When dial *#06# javacrash happens."

src/com/android/dialer/SpecialCharSequenceMgr.java

diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java
index f466c41..eadb6ed 100644
--- a/src/com/android/dialer/SpecialCharSequenceMgr.java
+++ b/src/com/android/dialer/SpecialCharSequenceMgr.java
@@ -316,7 +316,7 @@
             AlertDialog alert = new AlertDialog.Builder(context)
                     .setTitle(labelResId)
                     .setItems(deviceIds.toArray(new String[deviceIds.size()]), null)
-                    .setPositiveButton(R.string.ok, null)
+                    .setPositiveButton(android.R.string.ok, null)
                     .setCancelable(false)
                     .show();
             return true;