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

Merge changes from topic "netstack_constant_cherrypick"

Browse Source 
* changes:
  Remove usage of Context.NETWORK_STACK_SERVICE
  Remove NETWORK_STACK_SERVICE constant
This commit is contained in:
Remi NGUYEN VAN
2020-03-23 03:33:58 +00:00
committed by Gerrit Code Review
parent c1cae420a2 d49a77f6e6
commit 341fa568b9
7 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -1544,7 +1544,6 @@ 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";
@@ -4671,6 +4670,7 @@ package android.net {
}
public class NetworkStack {
method @Nullable public static android.os.IBinder getService();
field public static final String PERMISSION_MAINLINE_NETWORK_STACK = "android.permission.MAINLINE_NETWORK_STACK";
}

2
api/test-current.txt
View File

@@ -658,7 +658,6 @@ package android.content {
field public static final String BUGREPORT_SERVICE = "bugreport";
field public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";
field public static final String ETHERNET_SERVICE = "ethernet";
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";
@@ -1519,6 +1518,7 @@ package android.net {
}
public class NetworkStack {
method @Nullable public static android.os.IBinder getService();
field public static final String PERMISSION_MAINLINE_NETWORK_STACK = "android.permission.MAINLINE_NETWORK_STACK";
}

8
core/java/android/app/SystemServiceRegistry.java
View File

@@ -347,14 +347,6 @@ 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

2
core/java/android/content/Context.java
View File

@@ -3864,8 +3864,6 @@ public abstract class Context {
* @hide
* @see NetworkStackClient
*/
@SystemApi
@TestApi
public static final String NETWORK_STACK_SERVICE = "network_stack";
/**

17
core/java/android/net/NetworkStack.java
View File

@@ -19,15 +19,17 @@ import static android.Manifest.permission.NETWORK_STACK;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.content.Context;
import android.os.IBinder;
import android.os.ServiceManager;
import java.util.ArrayList;
import java.util.Arrays;
/**
*
* Constants for client code communicating with the network stack service.
* Constants and utilities for client code communicating with the network stack service.
* @hide
*/
@SystemApi
@@ -43,6 +45,17 @@ public class NetworkStack {
public static final String PERMISSION_MAINLINE_NETWORK_STACK =
"android.permission.MAINLINE_NETWORK_STACK";
/**
* Get an {@link IBinder} representing the NetworkStack stable AIDL Interface, if registered.
* @hide
*/
@Nullable
@SystemApi
@TestApi
public static IBinder getService() {
return ServiceManager.getService(Context.NETWORK_STACK_SERVICE);
}
private NetworkStack() {}
/**

4
packages/Tethering/src/com/android/server/connectivity/tethering/TetheringService.java
View File

@@ -33,6 +33,7 @@ import android.net.ITetheringConnector;
import android.net.ITetheringEventCallback;
import android.net.NetworkCapabilities;
import android.net.NetworkRequest;
import android.net.NetworkStack;
import android.net.TetheringRequestParcel;
import android.net.dhcp.DhcpServerCallbacks;
import android.net.dhcp.DhcpServingParamsParcel;
@@ -364,8 +365,7 @@ public class TetheringService extends Service {
IBinder connector;
try {
final long before = System.currentTimeMillis();
while ((connector = (IBinder) mContext.getSystemService(
Context.NETWORK_STACK_SERVICE)) == null) {
while ((connector = NetworkStack.getService()) == null) {
if (System.currentTimeMillis() - before > NETWORKSTACK_TIMEOUT_MS) {
Log.wtf(TAG, "Timeout, fail to get INetworkStackConnector");
return null;

1
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -429,7 +429,6 @@ public class ConnectivityServiceTest {
public Object getSystemService(String name) {
if (Context.CONNECTIVITY_SERVICE.equals(name)) return mCm;
if (Context.NOTIFICATION_SERVICE.equals(name)) return mNotificationManager;
if (Context.NETWORK_STACK_SERVICE.equals(name)) return mNetworkStack;
if (Context.USER_SERVICE.equals(name)) return mUserManager;
if (Context.ALARM_SERVICE.equals(name)) return mAlarmManager;
if (Context.LOCATION_SERVICE.equals(name)) return mLocationManager;