Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Finalize @SystemApi annotation for StatsFrameworkInitializer (retry)"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-12 17:36:49 +00:00
committed by Android (Google) Code Review
parent fab4628666 553df30582
commit 98a201dcd9
4 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/statsd/framework/java/android/os/StatsFrameworkInitializer.java
View File

@@ -17,6 +17,7 @@ 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;
@@ -24,10 +25,9 @@ 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
@SystemApi(client = Client.MODULE_LIBRARIES)
public class StatsFrameworkInitializer {
private StatsFrameworkInitializer() {
}

24
api/module-lib-current.txt
View File

@@ -130,6 +130,30 @@ 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 {

20
api/system-current.txt
View File

@@ -8900,26 +8900,6 @@ 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();

5
core/java/android/os/StatsServiceManager.java
View File

@@ -18,17 +18,16 @@ 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
@SystemApi(client = Client.MODULE_LIBRARIES)
public class StatsServiceManager {
/**
* @hide