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

Commit dd98ed4e authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS"... 

Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS" am: 06657939 am: 601e411e am: df86fe65 am: 36a793e3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635045

Change-Id: I02b618f2f29c0900a6158ab8e0d70bc150857968
parents dd959aea 36a793e3

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

+6 −1
Original line number Diff line number Diff line
@@ -90,7 +90,12 @@ class TestNetworkService extends ITestNetworkManager.Stub { 
        mCm = mContext.getSystemService(ConnectivityManager.class);

        mNetworkProvider = new NetworkProvider(mContext, mHandler.getLooper(),

                TEST_NETWORK_PROVIDER_NAME);

        final long token = Binder.clearCallingIdentity();

        try {

            mCm.registerNetworkProvider(mNetworkProvider);

        } finally {

            Binder.restoreCallingIdentity(token);

        }

    }



    /**