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

Commit 41d0d656 authored by Benedict Wong's avatar Benedict Wong Committed by android-build-merger
Browse files

Merge changes I98573a5c,Ic7394f24 am: c6ce6fc8 

am: ed4f59e2

Change-Id: I279765199a80b0639dde31302778a95c0f9fd705
parents 76d3c3d0 ed4f59e2

core/java/android/app/SystemServiceRegistry.java

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ final class SystemServiceRegistry { 
                            throw new ServiceNotFoundException(Context.TEST_NETWORK_SERVICE);

                        }

                        ITestNetworkManager tnMgr = ITestNetworkManager.Stub.asInterface(tnBinder);

                        return new TestNetworkManager(context, tnMgr);

                        return new TestNetworkManager(tnMgr);

                    }

                });

core/java/android/net/TestNetworkInterface.java

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ import android.os.Parcelable; 
 */

@TestApi

public final class TestNetworkInterface implements Parcelable {

    private static final String TAG = "TestNetworkInterface";



    private final ParcelFileDescriptor mFileDescriptor;

    private final String mInterfaceName;

core/java/android/net/TestNetworkManager.java

+1 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ package android.net; 


import android.annotation.NonNull;

import android.annotation.TestApi;

import android.content.Context;

import android.os.IBinder;

import android.os.RemoteException;
@@ -33,11 +32,9 @@ public class TestNetworkManager { 
    @NonNull private static final String TAG = TestNetworkManager.class.getSimpleName();



    @NonNull private final ITestNetworkManager mService;

    @NonNull private final Context mContext;



    /** @hide */

    public TestNetworkManager(@NonNull Context context, @NonNull ITestNetworkManager service) {

        mContext = Preconditions.checkNotNull(context, "missing Context");

    public TestNetworkManager(@NonNull ITestNetworkManager service) {

        mService = Preconditions.checkNotNull(service, "missing ITestNetworkManager");

    }

services/core/java/com/android/server/TestNetworkService.java

+4 −8
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ class TestNetworkService extends ITestNetworkManager.Stub { 
    public void teardownTestNetwork(int netId) {

        enforceTestNetworkPermissions(mContext);



        TestNetworkAgent agent;

        final TestNetworkAgent agent;

        synchronized (mTestNetworkTracker) {

            agent = mTestNetworkTracker.get(netId);

        }
@@ -325,14 +325,10 @@ class TestNetworkService extends ITestNetworkManager.Stub { 
        agent.teardown();

    }



    // STOPSHIP: Change this back to android.Manifest.permission.MANAGE_TEST_NETWORKS

    private static final String PERMISSION_NAME = "dummy";

    private static final String PERMISSION_NAME =

            android.Manifest.permission.MANAGE_TEST_NETWORKS;



    public static void enforceTestNetworkPermissions(@NonNull Context context) {

        // STOPSHIP: Re-enable these checks. Disabled until adoptShellPermissionIdentity() can be

        //           called from CTS test code.

        if (false) {

        context.enforceCallingOrSelfPermission(PERMISSION_NAME, "TestNetworkService");

    }

}
 
}