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" am: 13020490be

Browse Source 
am: a9b3f91828

Change-Id: Iac1fdeff968b131e8f3486060dfb7cdeed446157
This commit is contained in:
David Brazdil
2018-01-29 15:59:49 +00:00
committed by android-build-merger
parent 223ba4c536 a9b3f91828
commit 1e1c4fc802
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

@@ -7040,7 +7040,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) {
@@ -7063,8 +7063,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()) {