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

Commit f1a14ae3 authored by David Brazdil's avatar David Brazdil Committed by Automerger Merge Worker
Browse files

Merge "Add virtualization_framework_native flag namespace" am: 5d72f2ea am: 3169ea60 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873903

Change-Id: I979041f3162bb310c21c959dc3e47d58c046c100
parents c48c44d2 3169ea60

core/java/android/provider/DeviceConfig.java

+8 −0
Original line number Diff line number Diff line
@@ -621,6 +621,14 @@ public final class DeviceConfig { 
     */

    public static final String NAMESPACE_GAME_OVERLAY = "game_overlay";



    /**

     * Namespace for Android Virtualization Framework related features accessible by native code.

     *

     * @hide

     */

    public static final String NAMESPACE_VIRTUALIZATION_FRAMEWORK_NATIVE =

            "virtualization_framework_native";



    /**

     * Namespace for Constrain Display APIs related features.

     *

services/core/java/com/android/server/am/SettingsToPropertiesMapper.java

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ public class SettingsToPropertiesMapper { 
        DeviceConfig.NAMESPACE_STATSD_NATIVE_BOOT,

        DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,

        DeviceConfig.NAMESPACE_TETHERING,

        DeviceConfig.NAMESPACE_VIRTUALIZATION_FRAMEWORK_NATIVE,

        DeviceConfig.NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT,

    };