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

Commit df86fe65 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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6edda160620b4a3cbcf85f21081a41d959cf3173
parents ce43593e 601e411e

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);

        }

    }



    /**