Merge "Fix crash for showing linker errors for apps with no label" into nyc-dev

2016-03-03 17:04:22 +00:00
parent 2cca0a930b d93f3b10e2
commit f08b7b3698
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -6599,7 +6599,8 @@ public class Activity extends ContextThemeWrapper
        if (isAppDebuggable || isDlwarningEnabled) {
            String dlwarning = getDlWarning();
            if (dlwarning != null) {
-                String appName = getString(mApplication.getApplicationInfo().labelRes);
+                String appName = getApplicationInfo().loadLabel(getPackageManager())
+                        .toString();
                String warning = "Detected problems with app native libraries\n" +
                                 "(please consult log for detail):\n" + dlwarning;
                if (isAppDebuggable) {