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

Commit 61936ee3 authored by Jason Monk's avatar Jason Monk
Browse files

Remove Dependency.get usages from SecurityControllerImpl 

Test: atest SystemUITests
Change-Id: Ieb42cd2bc45076ffee12c54154857642e95b4d58
parent 03561a8f

packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java

+11 −6
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

package com.android.systemui.statusbar.policy;



import static com.android.systemui.Dependency.BG_HANDLER_NAME;



import android.app.ActivityManager;

import android.app.admin.DevicePolicyManager;

import android.content.BroadcastReceiver;
@@ -47,7 +49,6 @@ import android.util.SparseArray; 
import com.android.internal.annotations.GuardedBy;

import com.android.internal.net.LegacyVpnInfo;

import com.android.internal.net.VpnConfig;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.settings.CurrentUserTracker;
@@ -56,6 +57,7 @@ import java.io.PrintWriter; 
import java.util.ArrayList;



import javax.inject.Inject;

import javax.inject.Named;

import javax.inject.Singleton;



/**
@@ -84,6 +86,7 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi 
    private final DevicePolicyManager mDevicePolicyManager;

    private final PackageManager mPackageManager;

    private final UserManager mUserManager;

    private final Handler mBgHandler;



    @GuardedBy("mCallbacks")

    private final ArrayList<SecurityControllerCallback> mCallbacks = new ArrayList<>();
@@ -99,13 +102,15 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi 
    /**

     */

    @Inject

    public SecurityControllerImpl(Context context) {

        this(context, null);

    public SecurityControllerImpl(Context context, @Named(BG_HANDLER_NAME) Handler bgHandler) {

        this(context, bgHandler, null);

    }



    public SecurityControllerImpl(Context context, SecurityControllerCallback callback) {

    public SecurityControllerImpl(Context context, Handler bgHandler,

            SecurityControllerCallback callback) {

        super(context);

        mContext = context;

        mBgHandler = bgHandler;

        mDevicePolicyManager = (DevicePolicyManager)

                context.getSystemService(Context.DEVICE_POLICY_SERVICE);

        mConnectivityManager = (ConnectivityManager)
@@ -121,7 +126,7 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi 
        IntentFilter filter = new IntentFilter();

        filter.addAction(KeyChain.ACTION_TRUST_STORE_CHANGED);

        context.registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL, filter, null,

                new Handler(Dependency.get(Dependency.BG_LOOPER)));

                bgHandler);



        // TODO: re-register network callback on user change.

        mConnectivityManager.registerNetworkCallback(REQUEST, mNetworkCallback);
@@ -413,7 +418,7 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi 
                return new Pair<Integer, Boolean>(userId[0], hasCACerts);

            } catch (RemoteException | InterruptedException | AssertionError e) {

                Log.i(TAG, "failed to get CA certs", e);

                new Handler(Dependency.get(Dependency.BG_LOOPER)).postDelayed(

                mBgHandler.postDelayed(

                        () -> new CACertLoader().execute(userId[0]),

                        CA_CERT_LOADING_RETRY_TIME_IN_MS);

                return new Pair<Integer, Boolean>(userId[0], null);

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SecurityControllerTest.java

+6 −1
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ import android.net.ConnectivityManager; 
import android.net.ConnectivityManager.NetworkCallback;

import android.net.NetworkCapabilities;

import android.net.NetworkRequest;

import android.os.Handler;

import android.os.Looper;

import android.os.UserManager;

import android.security.IKeyChainService;

import android.support.test.runner.AndroidJUnit4;
@@ -98,7 +100,10 @@ public class SecurityControllerTest extends SysuiTestCase implements SecurityCon 
        // Wait for callbacks from 1) the CACertLoader and 2) the onUserSwitched() function in the

        // constructor of mSecurityController

        mStateChangedLatch = new CountDownLatch(2);

        mSecurityController = new SecurityControllerImpl(mContext, this);

        // TODO: Migrate this test to TestableLooper and use a handler attached

        // to that.

        mSecurityController = new SecurityControllerImpl(mContext,

                new Handler(Looper.getMainLooper()), this);

    }



    @After