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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18d1f14d5227b644c3a6a7d54f68475235af5724
parents 0d87de94 36a793e3

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

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

        mCm = mContext.getSystemService(ConnectivityManager.class);

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

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

                TEST_NETWORK_PROVIDER_NAME);

                TEST_NETWORK_PROVIDER_NAME);

        final long token = Binder.clearCallingIdentity();

        try {

            mCm.registerNetworkProvider(mNetworkProvider);

            mCm.registerNetworkProvider(mNetworkProvider);

        } finally {

            Binder.restoreCallingIdentity(token);

        }

    }

    }





    /**

    /**