summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2019-10-03 19:03:23 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-10-03 19:03:23 +0000
commit363a602bd1de8dc0984231ab0b0a5015ecbc616b (patch)
tree43c2c0f652c84f3f9bef07aca5edbb5d3e0a6b26 /core/java/android
parentd34e18c0361991795faa7b9a62a1382c76573793 (diff)
parente14fa97af99ab81413ed007f308e312243c0ce47 (diff)
Merge "Remove a user/userdebug difference."
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/Activity.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index dc52c52cca1f..fd8d233fdd02 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -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())