Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge "Fix issue #18053"

  • Loading branch information...
commit c9931f1bb1c1f233649eebfde5985d4e4f528669 2 parents 123f2af + 088f12f
Jean-Baptiste Queru authored android code review committed
Showing with 4 additions and 4 deletions.
  1. +4 −4 src/com/android/phone/PhoneUtils.java
8 src/com/android/phone/PhoneUtils.java
View
@@ -943,7 +943,7 @@ static void displayMMIComplete(final Phone phone, Context context, final MmiCode
if (DBG) log("- using text from PENDING MMI message: '" + text + "'");
break;
case CANCELLED:
- text = context.getText(R.string.mmiCancelled);
+ text = null;
break;
case COMPLETE:
if (app.getPUKEntryActivity() != null) {
@@ -1010,10 +1010,10 @@ static void displayMMIComplete(final Phone phone, Context context, final MmiCode
} catch (RemoteException e) {
mNwService = null;
}
- if (DBG) log("Extended NW displayMMIInitiate (" + text + ")");
- if (text == null || text.length() == 0)
- return;
}
+ if (DBG) log("Extended NW displayMMIInitiate (" + text + ")");
+ if (text == null || text.length() == 0)
+ return;
// displaying system alert dialog on the screen instead of
// using another activity to display the message. This
Please sign in to comment.
Something went wrong with that request. Please try again.