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

Commit 62d82e0b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use `ro.boot.qemu` to check if the device is an emulator"

parents f98037ab d6a9f425

core/java/android/os/Build.java

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public class Build { 
     */

    @UnsupportedAppUsage

    @TestApi

    public static final boolean IS_EMULATOR = getString("ro.kernel.qemu").equals("1");

    public static final boolean IS_EMULATOR = getString("ro.boot.qemu").equals("1");



    /**

     * A hardware serial number, if available. Alphanumeric only, case-insensitive.

libs/hwui/Properties.cpp

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ bool Properties::load() { 
    SkAndroidFrameworkTraceUtil::setEnableTracing(

            base::GetBoolProperty(PROPERTY_SKIA_ATRACE_ENABLED, false));



    runningInEmulator = base::GetBoolProperty(PROPERTY_QEMU_KERNEL, false);

    runningInEmulator = base::GetBoolProperty(PROPERTY_IS_EMULATOR, false);



    defaultRenderAhead = std::max(-1, std::min(2, base::GetIntProperty(PROPERTY_RENDERAHEAD,

            render_ahead().value_or(0))));

libs/hwui/Properties.h

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ enum DebugLevel { 
/**

 * Property for whether this is running in the emulator.

 */

#define PROPERTY_QEMU_KERNEL "ro.kernel.qemu"

#define PROPERTY_IS_EMULATOR "ro.boot.qemu"



#define PROPERTY_RENDERAHEAD "debug.hwui.render_ahead"

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -2445,8 +2445,8 @@ class DatabaseHelper extends SQLiteOpenHelper { 
                    R.bool.def_auto_time_zone); // Sync timezone to NITZ



            loadSetting(stmt, Settings.Global.STAY_ON_WHILE_PLUGGED_IN,

                    ("1".equals(SystemProperties.get("ro.kernel.qemu")) ||

                        res.getBoolean(R.bool.def_stay_on_while_plugged_in))

                    ("1".equals(SystemProperties.get("ro.boot.qemu"))

                        || res.getBoolean(R.bool.def_stay_on_while_plugged_in))

                     ? 1 : 0);



            loadIntegerSetting(stmt, Settings.Global.WIFI_SLEEP_POLICY,

services/core/java/com/android/server/clipboard/ClipboardService.java

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ public class ClipboardService extends SystemService { 


    private static final String TAG = "ClipboardService";

    private static final boolean IS_EMULATOR =

        SystemProperties.getBoolean("ro.kernel.qemu", false);

            SystemProperties.getBoolean("ro.boot.qemu", false);



    private final ActivityManagerInternal mAmInternal;

    private final IUriGrantsManager mUgm;