diff options
| author | Elliott Hughes <enh@google.com> | 2019-10-03 12:49:54 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-03 12:49:54 -0700 |
| commit | b43a2eacba0bd4e256d892bd1403a4ec9bf50325 (patch) | |
| tree | 3b464d0440c7a686fd700c2b40c58174abf5a5ab /core/java/android | |
| parent | 843c2951fc2140f7b9b76639fc3ab0b655e90cef (diff) | |
| parent | 593650f907ee16a83a61d7576d2c95a8ef42e91c (diff) | |
Merge "Remove a user/userdebug difference." am: 363a602bd1 am: 47991c1b07 am: df703bcdf2
am: 593650f907
Change-Id: I7d777426c71a6b623c5957d287f1aa75afdd2afe
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/Activity.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index cf36032e8a05..03300e44f9fb 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; @@ -7866,13 +7865,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()) |