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

Commit 9999e16d authored Mar 02, 2022 by Binh Nguyen Committed by Automerger Merge Worker Mar 02, 2022

Merge "Add DeviceConfig namespace for AdServices module" into tm-dev am: 47719703

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

Change-Id: I57fa9df0e4341c4bf57cc5969eb00c654b41a51c

parents 45b12372 47719703

core/api/system-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10294,6 +10294,7 @@ package android.provider {
	method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static boolean setProperty(@NonNull String, @NonNull String, @Nullable String, boolean);		method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static boolean setProperty(@NonNull String, @NonNull String, @Nullable String, boolean);
	field public static final String NAMESPACE_ACTIVITY_MANAGER = "activity_manager";		field public static final String NAMESPACE_ACTIVITY_MANAGER = "activity_manager";
	field public static final String NAMESPACE_ACTIVITY_MANAGER_NATIVE_BOOT = "activity_manager_native_boot";		field public static final String NAMESPACE_ACTIVITY_MANAGER_NATIVE_BOOT = "activity_manager_native_boot";
			field public static final String NAMESPACE_ADSERVICES = "adservices";
	field public static final String NAMESPACE_AMBIENT_CONTEXT_MANAGER_SERVICE = "ambient_context_manager_service";		field public static final String NAMESPACE_AMBIENT_CONTEXT_MANAGER_SERVICE = "ambient_context_manager_service";
	field public static final String NAMESPACE_APPSEARCH = "appsearch";		field public static final String NAMESPACE_APPSEARCH = "appsearch";
	field public static final String NAMESPACE_APP_COMPAT = "app_compat";		field public static final String NAMESPACE_APP_COMPAT = "app_compat";
	@@ -10338,7 +10339,6 @@ package android.provider {
	field public static final String NAMESPACE_STATSD_NATIVE_BOOT = "statsd_native_boot";		field public static final String NAMESPACE_STATSD_NATIVE_BOOT = "statsd_native_boot";
	field @Deprecated public static final String NAMESPACE_STORAGE = "storage";		field @Deprecated public static final String NAMESPACE_STORAGE = "storage";
	field public static final String NAMESPACE_STORAGE_NATIVE_BOOT = "storage_native_boot";		field public static final String NAMESPACE_STORAGE_NATIVE_BOOT = "storage_native_boot";
	field public static final String NAMESPACE_SUPPLEMENTAL_API = "supplemental_api";
	field public static final String NAMESPACE_SURFACE_FLINGER_NATIVE_BOOT = "surface_flinger_native_boot";		field public static final String NAMESPACE_SURFACE_FLINGER_NATIVE_BOOT = "surface_flinger_native_boot";
	field public static final String NAMESPACE_SWCODEC_NATIVE = "swcodec_native";		field public static final String NAMESPACE_SWCODEC_NATIVE = "swcodec_native";
	field public static final String NAMESPACE_SYSTEMUI = "systemui";		field public static final String NAMESPACE_SYSTEMUI = "systemui";

core/java/android/provider/DeviceConfig.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -471,11 +471,11 @@ public final class DeviceConfig {
	public static final String NAMESPACE_STORAGE_NATIVE_BOOT = "storage_native_boot";		public static final String NAMESPACE_STORAGE_NATIVE_BOOT = "storage_native_boot";

	/**		/**
	* Namespace for all Supplemental Api related features.		* Namespace for all AdServices related features.
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public static final String NAMESPACE_SUPPLEMENTAL_API = "supplemental_api";		public static final String NAMESPACE_ADSERVICES = "adservices";

	/**		/**
	* Namespace for all SurfaceFlinger features that are used at the native level.		* Namespace for all SurfaceFlinger features that are used at the native level.