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

Commit 54a65656 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Android (Google) Code Review
Browse files

Merge changes from topic "netstack_api_review" into rvc-dev 

* changes:
  Remove usage of Context.NETWORK_STACK_SERVICE
  Remove NETWORK_STACK_SERVICE constant
parents 76b89b6d 438018d1

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1807,7 +1807,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";
@@ -6401,6 +6400,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";















  }















































api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -829,7 +829,6 @@ package android.content {













    field public static final String DEVICE_IDLE_CONTROLLER = "deviceidle";















    field public static final String DREAM_SERVICE = "dream";















    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 POWER_WHITELIST_MANAGER = "power_whitelist";















    field public static final String ROLLBACK_SERVICE = "rollback";










@@ -1830,6 +1829,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";















  }

















































core/java/android/app/SystemServiceRegistry.java



+0
−8




























Original line number
Diff line number
Diff line








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

































core/java/android/content/Context.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -3984,8 +3984,6 @@ public abstract class Context {













     * @hide















     * @see NetworkStackClient















     */













    @SystemApi













    @TestApi















    public static final String NETWORK_STACK_SERVICE = "network_stack";































    /**

































core/java/android/net/NetworkStack.java



+15
−2




























Original line number
Diff line number
Diff line








@@ -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() {}































    /**