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

Commit a2eeced7 authored Jan 22, 2019 by TreeHugger Robot Committed by Android (Google) Code Review Jan 22, 2019

Merge "Adding native flag namespace(netd)."

parents 4188aeb5 db279e8b

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -5265,6 +5265,7 @@ package android.provider {
		field public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture";
		field public static final String NAMESPACE_GAME_DRIVER = "game_driver";
		field public static final String NAMESPACE_INPUT_NATIVE_BOOT = "input_native_boot";
		field public static final String NAMESPACE_NETD_NATIVE = "netd_native";
		}

		public static interface DeviceConfig.OnPropertyChangedListener {

core/java/android/provider/DeviceConfig.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,14 @@ public final class DeviceConfig {
		@SystemApi
		public static final String NAMESPACE_INPUT_NATIVE_BOOT = "input_native_boot";

		/**
		* Namespace for all netd related features.
		*
		* @hide
		*/
		@SystemApi
		public static final String NAMESPACE_NETD_NATIVE = "netd_native";

		private static final Object sLock = new Object();
		@GuardedBy("sLock")
		private static Map<OnPropertyChangedListener, Pair<String, Executor>> sListeners =

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,7 @@ class SettingsToPropertiesMapper {
		@VisibleForTesting
		static final String[] sDeviceConfigScopes = new String[] {
		DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT,
		DeviceConfig.NAMESPACE_NETD_NATIVE,
		};

		private final String[] mGlobalSettings;