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

Merge "Control hidden API toast with a system property"

Browse Source 
am: 13020490be

Change-Id: Ib390fd568e4a5d71cdceec3a84b0d55e02b9c45d
This commit is contained in:
David Brazdil
2018-01-29 15:52:46 +00:00
committed by android-build-merger
parent d98c6b91a5 13020490be
commit a9b3f91828
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7044,7 +7044,7 @@ public class Activity extends ContextThemeWrapper
boolean isAppDebuggable =
(mApplication.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
// This property is set for all builds except final release
// 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) {
@@ -7067,8 +7067,8 @@ public class Activity extends ContextThemeWrapper
}
}
// We might disable this for final builds.
boolean isApiWarningEnabled = true;
// This property is set for all non-user builds except final release
boolean isApiWarningEnabled = SystemProperties.getInt("ro.art.hiddenapi.warning", 0) == 1;
if (isAppDebuggable || isApiWarningEnabled) {
if (VMRuntime.getRuntime().hasUsedHiddenApi()) {