Merge "Add NETWORK_STACK_SERVICE to SystemServiceRegistry"

This commit is contained in:
Mark Chien
2020-01-14 04:17:20 +00:00
committed by Gerrit Code Review
4 changed files with 13 additions and 1 deletions

View File

@@ -1573,6 +1573,7 @@ package android.content {
field public static final String NETD_SERVICE = "netd";
field public static final String NETWORK_POLICY_SERVICE = "netpolicy";
field public static final String NETWORK_SCORE_SERVICE = "network_score";
field public static final String NETWORK_STACK_SERVICE = "network_stack";
field public static final String OEM_LOCK_SERVICE = "oem_lock";
field public static final String PERMISSION_SERVICE = "permission";
field public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block";

View File

@@ -651,6 +651,7 @@ package android.content {
method public void setContentCaptureOptions(@Nullable android.content.ContentCaptureOptions);
field public static final String BUGREPORT_SERVICE = "bugreport";
field public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";
field public static final String NETWORK_STACK_SERVICE = "network_stack";
field public static final String PERMISSION_SERVICE = "permission";
field public static final String ROLLBACK_SERVICE = "rollback";
field public static final String STATUS_BAR_SERVICE = "statusbar";

View File

@@ -341,6 +341,14 @@ final class SystemServiceRegistry {
}
});
registerService(Context.NETWORK_STACK_SERVICE, IBinder.class,
new StaticServiceFetcher<IBinder>() {
@Override
public IBinder createService() {
return ServiceManager.getService(Context.NETWORK_STACK_SERVICE);
}
});
registerService(Context.TETHERING_SERVICE, TetheringManager.class,
new CachedServiceFetcher<TetheringManager>() {
@Override

View File

@@ -3851,10 +3851,12 @@ public abstract class Context {
/**
* Use with {@link android.os.ServiceManager.getService()} to retrieve a
* {@link NetworkStackClient} IBinder for communicating with the network stack
* {@link INetworkStackConnector} IBinder for communicating with the network stack
* @hide
* @see NetworkStackClient
*/
@SystemApi
@TestApi
public static final String NETWORK_STACK_SERVICE = "network_stack";
/**