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

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index be89b20..b87e9fa 100644 (file)
--- 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) {