commit f00642b01620a4ff7bd99e5a2ff6132cc60c7f11
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 29 00:10:36 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 29 00:10:37 2017 +0000
tree 86b4c01bd17ca5980d37e089bc9511b28727946c
parent 13fd98d2629683a13e91f869ca422427b43c9473
parent 51c0907feb1a06333547f96134574fb462872c38

Merge "Expose ImsManager#setWfcNonPersistentForSlot"

src/java/com/android/ims/ImsUt.java

diff --git a/src/java/com/android/ims/ImsUt.java b/src/java/com/android/ims/ImsUt.java
index 75a0b52..4cc7011 100644
--- a/src/java/com/android/ims/ImsUt.java
+++ b/src/java/com/android/ims/ImsUt.java
@@ -19,6 +19,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import android.content.res.Resources;
 import android.os.AsyncResult;
 import android.os.Bundle;
 import android.os.Message;
@@ -539,7 +540,8 @@
         // If ImsReasonInfo object does not have a String error code, use a
         // default error string.
         if (error.mExtraMessage == null) {
-            errorString = new String("IMS UT exception");
+            errorString = Resources.getSystem().getString(
+                    com.android.internal.R.string.mmiError);
         }
         else {
             errorString = new String(error.mExtraMessage);