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

Commit 363a602b authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Remove a user/userdebug difference."

parents d34e18c0 e14fa97a

core/java/android/app/Activity.java

+2 −6
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ import android.os.Process; 
import android.os.RemoteException;

import android.os.ServiceManager.ServiceNotFoundException;

import android.os.StrictMode;

import android.os.SystemProperties;

import android.os.Trace;

import android.os.UserHandle;

import android.text.Selection;
@@ -7833,13 +7832,10 @@ public class Activity extends ContextThemeWrapper 
        mFragments.dispatchStart();

        mFragments.reportLoaderStart();



        // Warn app developers if the dynamic linker logged anything during startup.

        boolean isAppDebuggable =

                (mApplication.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;



        // This property is set for all non-user builds except final release

        boolean isDlwarningEnabled = SystemProperties.getInt("ro.bionic.ld.warning", 0) == 1;



        if (isAppDebuggable || isDlwarningEnabled) {

        if (isAppDebuggable) {

            String dlwarning = getDlWarning();

            if (dlwarning != null) {

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