Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove a user/userdebug difference."

Browse Source
This commit is contained in:
Elliott Hughes
2019-10-03 19:03:23 +00:00
committed by Gerrit Code Review
parent d34e18c036 e14fa97af9
commit 363a602bd1
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/Activity.java
View File

@@ -76,7 +76,6 @@ import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager.ServiceNotFoundException; import android.os.ServiceManager.ServiceNotFoundException;
import android.os.StrictMode; import android.os.StrictMode;
import android.os.SystemProperties;
import android.os.Trace; import android.os.Trace;
import android.os.UserHandle; import android.os.UserHandle;
import android.text.Selection; import android.text.Selection;
@@ -7833,13 +7832,10 @@ public class Activity extends ContextThemeWrapper
mFragments.dispatchStart(); mFragments.dispatchStart();
mFragments.reportLoaderStart(); mFragments.reportLoaderStart();
// Warn app developers if the dynamic linker logged anything during startup.
boolean isAppDebuggable = boolean isAppDebuggable =
(mApplication.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0; (mApplication.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
if (isAppDebuggable) {
// 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) {
String dlwarning = getDlWarning(); String dlwarning = getDlWarning();
if (dlwarning != null) { if (dlwarning != null) {
String appName = getApplicationInfo().loadLabel(getPackageManager()) String appName = getApplicationInfo().loadLabel(getPackageManager())