Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeed1841 authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

Merge "Control hidden API toast with a system property" am: 13020490 am: a9b3f918 

am: 1e1c4fc8

Change-Id: I0b2d898dbdac8ed6ac8995bab521b62adb5d0f2e
parents 431af2d3 1e1c4fc8

core/java/android/app/Activity.java

+3 −3
Original line number Diff line number Diff line
@@ -7118,7 +7118,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) {
@@ -7141,8 +7141,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()) {