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

Commit d74a3b3c authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Finalize @SystemApi annotation for StatsFrameworkInitializer 

Change-Id: I2a7f8fcecbd12da4d8244fd848dff53ba86d4e31
Fix: 148225705
Test: build / treehugger
parent c0324f3a

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

+2 −2
Original line number Diff line number Diff line
@@ -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() {

    }

api/module-lib-current.txt

+24 −0
Original line number Diff line number Diff line
@@ -120,6 +120,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 {

api/system-current.txt

+0 −20
Original line number Diff line number Diff line
@@ -8843,26 +8843,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();

























core/java/android/os/StatsServiceManager.java



+2
−3




























Original line number
Diff line number
Diff line








@@ -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