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

Commit d50e0e2e 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

* commit 'f08b7b36':
  Fix crash for showing linker errors for apps with no label
parents 99c1d934 f08b7b36

core/java/android/app/Activity.java

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