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

Commit a825277f authored by Adam Powell's avatar Adam Powell Committed by android-build-merger
Browse files

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

am: d50e0e2e

* commit 'd50e0e2e':
  Fix crash for showing linker errors for apps with no label
parents 837e9e32 d50e0e2e

core/java/android/app/Activity.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -6604,7 +6604,8 @@ public class Activity extends ContextThemeWrapper 
        if (isAppDebuggable || isDlwarningEnabled) {

        if (isAppDebuggable || isDlwarningEnabled) {

            String dlwarning = getDlWarning();

            String dlwarning = getDlWarning();

            if (dlwarning != null) {

            if (dlwarning != null) {

                String appName = getString(mApplication.getApplicationInfo().labelRes);

                String appName = getApplicationInfo().loadLabel(getPackageManager())

                        .toString();

                String warning = "Detected problems with app native libraries\n" +

                String warning = "Detected problems with app native libraries\n" +

                                 "(please consult log for detail):\n" + dlwarning;

                                 "(please consult log for detail):\n" + dlwarning;

                if (isAppDebuggable) {

                if (isAppDebuggable) {