Merge "Revert "Finalize @SystemApi annotation for StatsFrameworkInitializer"" (66660415) · Commits · e / os / android_frameworks_base

apex/statsd/framework/java/android/os/StatsFrameworkInitializer.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ package android.os;

		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.annotation.SystemApi.Client;
		import android.app.StatsManager;
		import android.app.SystemServiceRegistry;
		import android.content.Context;
		@@ -25,9 +24,10 @@ import android.content.Context;
		/**
		* Class for performing registration for all stats services
		*
		* TODO(b/148225705) Change to @SystemApi(client=MODULE_LIBRARIES) when the build system is ready.
		* @hide
		*/
		@SystemApi(client = Client.MODULE_LIBRARIES)
		@SystemApi
		public class StatsFrameworkInitializer {
		private StatsFrameworkInitializer() {
		}

api/module-lib-current.txt

+0 −24

Original line number	Diff line number	Diff line
		@@ -120,30 +120,6 @@ package android.net {

		}

		package android.os {

		public class StatsFrameworkInitializer {
		method public static void registerServiceWrappers();
		method public static void setStatsServiceManager(@NonNull android.os.StatsServiceManager);
		}

		public class StatsServiceManager {
		method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsCompanionServiceRegisterer();
		method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsManagerServiceRegisterer();
		method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsdServiceRegisterer();
		}

		public static class StatsServiceManager.ServiceNotFoundException extends java.lang.Exception {
		ctor public StatsServiceManager.ServiceNotFoundException(@NonNull String);
		}

		public static final class StatsServiceManager.ServiceRegisterer {
		method @Nullable public android.os.IBinder get();
		method @Nullable public android.os.IBinder getOrThrow() throws android.os.StatsServiceManager.ServiceNotFoundException;
		}

		}

		package android.os.ext.test {

		@Deprecated public class Test {

api/system-current.txt

+20 −0

Original line number	Diff line number	Diff line
		@@ -8874,6 +8874,26 @@ package android.os {
		field public static final int TUPLE_VALUE_TYPE = 7; // 0x7
		}

		public class StatsFrameworkInitializer {
		method public static void registerServiceWrappers();
		method public static void setStatsServiceManager(@NonNull android.os.StatsServiceManager);
		}

		public class StatsServiceManager {
		method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsCompanionServiceRegisterer();
		method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsManagerServiceRegisterer();
		method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsdServiceRegisterer();
		}

		public static class StatsServiceManager.ServiceNotFoundException extends java.lang.Exception {
		ctor public StatsServiceManager.ServiceNotFoundException(@NonNull String);
		}

		public static final class StatsServiceManager.ServiceRegisterer {
		method @Nullable public android.os.IBinder get();
		method @Nullable public android.os.IBinder getOrThrow() throws android.os.StatsServiceManager.ServiceNotFoundException;
		}

		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();

core/java/android/os/StatsServiceManager.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -18,16 +18,17 @@ package android.os;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.annotation.SystemApi.Client;

		/**
		* Provides a way to register and obtain the system service binder objects managed by the stats
		* service.
		*
		* <p> Only the statsd mainline module will be able to access an instance of this class.
		*
		* TODO(b/148225705) Change to @SystemApi(client=MODULE_LIBRARIES) when the build system is ready.
		* @hide
		*/
		@SystemApi(client = Client.MODULE_LIBRARIES)
		@SystemApi
		public class StatsServiceManager {
		/**
		* @hide