Merge "Add system service for accessing SystemConfig" (6392e254) · Commits · e / os / android_frameworks_base

api/system-current.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,7 @@ package android {
		field public static final String QUERY_TIME_ZONE_RULES = "android.permission.QUERY_TIME_ZONE_RULES";
		field public static final String RADIO_SCAN_WITHOUT_LOCATION = "android.permission.RADIO_SCAN_WITHOUT_LOCATION";
		field public static final String READ_ACTIVE_EMERGENCY_SESSION = "android.permission.READ_ACTIVE_EMERGENCY_SESSION";
		field public static final String READ_CARRIER_APP_INFO = "android.permission.READ_CARRIER_APP_INFO";
		field public static final String READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS";
		field public static final String READ_CONTENT_RATING_SYSTEMS = "android.permission.READ_CONTENT_RATING_SYSTEMS";
		field public static final String READ_DEVICE_CONFIG = "android.permission.READ_DEVICE_CONFIG";
		@@ -1753,6 +1754,7 @@ package android.content {
		field public static final String SECURE_ELEMENT_SERVICE = "secure_element";
		field public static final String STATS_MANAGER = "stats";
		field public static final String STATUS_BAR_SERVICE = "statusbar";
		field public static final String SYSTEM_CONFIG_SERVICE = "system_config";
		field public static final String SYSTEM_UPDATE_SERVICE = "system_update";
		field public static final String TELEPHONY_IMS_SERVICE = "telephony_ims";
		field public static final String TELEPHONY_REGISTRY_SERVICE = "telephony_registry";
		@@ -7485,6 +7487,11 @@ package android.os {
		field public static final int TUPLE_VALUE_TYPE = 7; // 0x7
		}

		public class SystemConfigManager {
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_CARRIER_APP_INFO) public java.util.Set<java.lang.String> getDisabledUntilUsedPreinstalledCarrierApps();
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_CARRIER_APP_INFO) public java.util.Map<java.lang.String,java.util.List<java.lang.String>> getDisabledUntilUsedPreinstalledCarrierAssociatedApps();
		}

		public class SystemProperties {
		method @NonNull public static String get(@NonNull String);
		method @NonNull public static String get(@NonNull String, @Nullable String);

api/test-current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -2181,6 +2181,11 @@ package android.os {
		method public void log(android.os.StrictMode.ViolationInfo);
		}

		public class SystemConfigManager {
		method @NonNull @RequiresPermission("android.permission.READ_CARRIER_APP_INFO") public java.util.Set<java.lang.String> getDisabledUntilUsedPreinstalledCarrierApps();
		method @NonNull @RequiresPermission("android.permission.READ_CARRIER_APP_INFO") public java.util.Map<java.lang.String,java.util.List<java.lang.String>> getDisabledUntilUsedPreinstalledCarrierAssociatedApps();
		}

		public class SystemProperties {
		method @NonNull public static String get(@NonNull String);
		method @NonNull public static String get(@NonNull String, @Nullable String);

core/java/android/app/SystemServiceRegistry.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -148,6 +148,7 @@ import android.os.RecoverySystem;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.ServiceManager.ServiceNotFoundException;
		import android.os.SystemConfigManager;
		import android.os.SystemUpdateManager;
		import android.os.SystemVibrator;
		import android.os.UserHandle;
		@@ -627,6 +628,13 @@ public final class SystemServiceRegistry {
		return new SystemUpdateManager(service);
		}});

		registerService(Context.SYSTEM_CONFIG_SERVICE, SystemConfigManager.class,
		new CachedServiceFetcher<SystemConfigManager>() {
		@Override
		public SystemConfigManager createService(ContextImpl ctx) {
		return new SystemConfigManager();
		}});

		registerService(Context.TELEPHONY_REGISTRY_SERVICE, TelephonyRegistryManager.class,
		new CachedServiceFetcher<TelephonyRegistryManager>() {
		@Override

core/java/android/content/Context.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -5018,6 +5018,14 @@ public abstract class Context {
		@TestApi
		public static final String TELEPHONY_IMS_SERVICE = "telephony_ims";

		/**
		* Use with {@link #getSystemService(String)} to retrieve an
		* {@link android.os.SystemConfigManager}.
		* @hide
		*/
		@SystemApi
		public static final String SYSTEM_CONFIG_SERVICE = "system_config";

		/**
		* Use with {@link #getSystemService(String)} to retrieve an
		* {@link android.telephony.ims.RcsMessageManager}.

core/java/android/os/ISystemConfig.aidl

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.os;

		/**
		* Binder interface to query SystemConfig in the system server.
		* {@hide}
		*/
		interface ISystemConfig {
		/**
		* @see SystemConfigManager#getDisabledUntilUsedPreinstalledCarrierApps
		*/
		List<String> getDisabledUntilUsedPreinstalledCarrierApps();

		/**
		* @see SystemConfigManager#getDisabledUntilUsedPreinstalledCarrierAssociatedApps
		*/
		Map getDisabledUntilUsedPreinstalledCarrierAssociatedApps();
		}