Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f08b7b36 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

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

parents 2cca0a93 d93f3b10

core/java/android/app/Activity.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {