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

Commit 9abca5e9 authored by Jason Monk's avatar Jason Monk
Browse files

Cleanup and refactoring of test utilities 

 - Make leak checking faster by converting to fakes
    - Requires making clean interfaces for all CallbackControllers
 - Integrate leak checking into the TestableContext

Test: runtest systemui
Change-Id: Ic57a06360d01a0323ef26735a543e9d1805459e2
parent 3c41744b

packages/SystemUI/src/com/android/systemui/statusbar/phone/ManagedProfileController.java

+4 −122
Original line number Diff line number Diff line
@@ -14,134 +14,16 @@ 


package com.android.systemui.statusbar.phone;



import android.app.ActivityManager;

import android.app.StatusBarManager;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.UserInfo;

import android.os.UserHandle;

import android.os.UserManager;



import com.android.systemui.statusbar.phone.ManagedProfileController.Callback;

import com.android.systemui.statusbar.policy.CallbackController;



import java.util.ArrayList;

import java.util.LinkedList;

import java.util.List;



public class ManagedProfileController implements CallbackController<Callback> {



    private final List<Callback> mCallbacks = new ArrayList<>();



    private final Context mContext;

    private final UserManager mUserManager;

    private final LinkedList<UserInfo> mProfiles;

    private boolean mListening;

    private int mCurrentUser;



    public ManagedProfileController(QSTileHost host) {

        mContext = host.getContext();

        mUserManager = UserManager.get(mContext);

        mProfiles = new LinkedList<UserInfo>();

    }



    public void addCallback(Callback callback) {

        mCallbacks.add(callback);

        if (mCallbacks.size() == 1) {

            setListening(true);

        }

        callback.onManagedProfileChanged();

    }



    public void removeCallback(Callback callback) {

        if (mCallbacks.remove(callback) && mCallbacks.size() == 0) {

            setListening(false);

        }

    }



    public void setWorkModeEnabled(boolean enableWorkMode) {

        synchronized (mProfiles) {

            for (UserInfo ui : mProfiles) {

                if (enableWorkMode) {

                    if (!mUserManager.trySetQuietModeDisabled(ui.id, null)) {

                        StatusBarManager statusBarManager = (StatusBarManager) mContext

                                .getSystemService(android.app.Service.STATUS_BAR_SERVICE);

                        statusBarManager.collapsePanels();

                    }

                } else {

                    mUserManager.setQuietModeEnabled(ui.id, true);

                }

            }

        }

    }



    private void reloadManagedProfiles() {

        synchronized (mProfiles) {

            boolean hadProfile = mProfiles.size() > 0;

            int user = ActivityManager.getCurrentUser();

            mProfiles.clear();

public interface ManagedProfileController extends CallbackController<Callback> {



            for (UserInfo ui : mUserManager.getEnabledProfiles(user)) {

                if (ui.isManagedProfile()) {

                    mProfiles.add(ui);

                }

            }

            if (mProfiles.size() == 0 && hadProfile && (user == mCurrentUser)) {

                for (Callback callback : mCallbacks) {

                    callback.onManagedProfileRemoved();

                }

            }

            mCurrentUser = user;

        }

    }

    void setWorkModeEnabled(boolean enabled);



    public boolean hasActiveProfile() {

        if (!mListening) reloadManagedProfiles();

        synchronized (mProfiles) {

            return mProfiles.size() > 0;

        }

    }

    boolean hasActiveProfile();



    public boolean isWorkModeEnabled() {

        if (!mListening) reloadManagedProfiles();

        synchronized (mProfiles) {

            for (UserInfo ui : mProfiles) {

                if (ui.isQuietModeEnabled()) {

                    return false;

                }

            }

            return true;

        }

    }



    private void setListening(boolean listening) {

        mListening = listening;

        if (listening) {

            reloadManagedProfiles();



            final IntentFilter filter = new IntentFilter();

            filter.addAction(Intent.ACTION_USER_SWITCHED);

            filter.addAction(Intent.ACTION_MANAGED_PROFILE_ADDED);

            filter.addAction(Intent.ACTION_MANAGED_PROFILE_REMOVED);

            filter.addAction(Intent.ACTION_MANAGED_PROFILE_AVAILABLE);

            filter.addAction(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE);

            mContext.registerReceiverAsUser(mReceiver, UserHandle.ALL, filter, null, null);

        } else {

            mContext.unregisterReceiver(mReceiver);

        }

    }



    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            reloadManagedProfiles();

            for (Callback callback : mCallbacks) {

                callback.onManagedProfileChanged();

            }

        }

    };

    boolean isWorkModeEnabled();



    public interface Callback {

        void onManagedProfileChanged();

packages/SystemUI/src/com/android/systemui/statusbar/phone/ManagedProfileControllerImpl.java

0 → 100644
+142 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

 * except in compliance with the License. You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software distributed under the

 * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

 * KIND, either express or implied. See the License for the specific language governing

 * permissions and limitations under the License.

 */



package com.android.systemui.statusbar.phone;



import android.app.ActivityManager;

import android.app.StatusBarManager;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.UserInfo;

import android.os.UserHandle;

import android.os.UserManager;



import java.util.ArrayList;

import java.util.LinkedList;

import java.util.List;



public class ManagedProfileControllerImpl implements ManagedProfileController {



    private final List<Callback> mCallbacks = new ArrayList<>();



    private final Context mContext;

    private final UserManager mUserManager;

    private final LinkedList<UserInfo> mProfiles;

    private boolean mListening;

    private int mCurrentUser;



    public ManagedProfileControllerImpl(QSTileHost host) {

        mContext = host.getContext();

        mUserManager = UserManager.get(mContext);

        mProfiles = new LinkedList<UserInfo>();

    }



    public void addCallback(Callback callback) {

        mCallbacks.add(callback);

        if (mCallbacks.size() == 1) {

            setListening(true);

        }

        callback.onManagedProfileChanged();

    }



    public void removeCallback(Callback callback) {

        if (mCallbacks.remove(callback) && mCallbacks.size() == 0) {

            setListening(false);

        }

    }



    public void setWorkModeEnabled(boolean enableWorkMode) {

        synchronized (mProfiles) {

            for (UserInfo ui : mProfiles) {

                if (enableWorkMode) {

                    if (!mUserManager.trySetQuietModeDisabled(ui.id, null)) {

                        StatusBarManager statusBarManager = (StatusBarManager) mContext

                                .getSystemService(android.app.Service.STATUS_BAR_SERVICE);

                        statusBarManager.collapsePanels();

                    }

                } else {

                    mUserManager.setQuietModeEnabled(ui.id, true);

                }

            }

        }

    }



    private void reloadManagedProfiles() {

        synchronized (mProfiles) {

            boolean hadProfile = mProfiles.size() > 0;

            int user = ActivityManager.getCurrentUser();

            mProfiles.clear();



            for (UserInfo ui : mUserManager.getEnabledProfiles(user)) {

                if (ui.isManagedProfile()) {

                    mProfiles.add(ui);

                }

            }

            if (mProfiles.size() == 0 && hadProfile && (user == mCurrentUser)) {

                for (Callback callback : mCallbacks) {

                    callback.onManagedProfileRemoved();

                }

            }

            mCurrentUser = user;

        }

    }



    public boolean hasActiveProfile() {

        if (!mListening) reloadManagedProfiles();

        synchronized (mProfiles) {

            return mProfiles.size() > 0;

        }

    }



    public boolean isWorkModeEnabled() {

        if (!mListening) reloadManagedProfiles();

        synchronized (mProfiles) {

            for (UserInfo ui : mProfiles) {

                if (ui.isQuietModeEnabled()) {

                    return false;

                }

            }

            return true;

        }

    }



    private void setListening(boolean listening) {

        mListening = listening;

        if (listening) {

            reloadManagedProfiles();



            final IntentFilter filter = new IntentFilter();

            filter.addAction(Intent.ACTION_USER_SWITCHED);

            filter.addAction(Intent.ACTION_MANAGED_PROFILE_ADDED);

            filter.addAction(Intent.ACTION_MANAGED_PROFILE_REMOVED);

            filter.addAction(Intent.ACTION_MANAGED_PROFILE_AVAILABLE);

            filter.addAction(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE);

            mContext.registerReceiverAsUser(mReceiver, UserHandle.ALL, filter, null, null);

        } else {

            mContext.unregisterReceiver(mReceiver);

        }

    }



    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            reloadManagedProfiles();

            for (Callback callback : mCallbacks) {

                callback.onManagedProfileChanged();

            }

        }

    };

}

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+15 −13
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static android.app.StatusBarManager.NAVIGATION_HINT_IME_SHOWN; 
import static android.app.StatusBarManager.WINDOW_STATE_HIDDEN;

import static android.app.StatusBarManager.WINDOW_STATE_SHOWING;

import static android.app.StatusBarManager.windowStateToString;



import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT;

import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT_TRANSPARENT;

import static com.android.systemui.statusbar.phone.BarTransitions.MODE_OPAQUE;
@@ -83,8 +84,8 @@ import android.os.Process; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.Trace;

import android.os.SystemProperties;

import android.os.Trace;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.Vibrator;
@@ -123,13 +124,13 @@ import com.android.keyguard.KeyguardHostView.OnDismissAction; 
import com.android.keyguard.KeyguardStatusView;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.KeyguardUpdateMonitorCallback;

import com.android.keyguard.LatencyTracker;

import com.android.keyguard.ViewMediatorCallback;

import com.android.systemui.BatteryMeterView;

import com.android.systemui.DemoMode;

import com.android.systemui.EventLogConstants;

import com.android.systemui.EventLogTags;

import com.android.systemui.Interpolators;

import com.android.keyguard.LatencyTracker;

import com.android.systemui.Prefs;

import com.android.systemui.R;

import com.android.systemui.SystemUIFactory;
@@ -178,19 +179,20 @@ import com.android.systemui.statusbar.policy.BluetoothControllerImpl; 
import com.android.systemui.statusbar.policy.BrightnessMirrorController;

import com.android.systemui.statusbar.policy.CastControllerImpl;

import com.android.systemui.statusbar.policy.EncryptionHelper;

import com.android.systemui.statusbar.policy.FlashlightController;

import com.android.systemui.statusbar.policy.FlashlightControllerImpl;

import com.android.systemui.statusbar.policy.HeadsUpManager;

import com.android.systemui.statusbar.policy.HotspotControllerImpl;

import com.android.systemui.statusbar.policy.KeyguardMonitor;

import com.android.systemui.statusbar.policy.KeyguardMonitorImpl;

import com.android.systemui.statusbar.policy.KeyguardUserSwitcher;

import com.android.systemui.statusbar.policy.LocationControllerImpl;

import com.android.systemui.statusbar.policy.NetworkController;

import com.android.systemui.statusbar.policy.NetworkControllerImpl;

import com.android.systemui.statusbar.policy.NextAlarmController;

import com.android.systemui.statusbar.policy.NextAlarmControllerImpl;

import com.android.systemui.statusbar.policy.PreviewInflater;

import com.android.systemui.statusbar.policy.RotationLockControllerImpl;

import com.android.systemui.statusbar.policy.SecurityControllerImpl;

import com.android.systemui.statusbar.policy.UserInfoController;

import com.android.systemui.statusbar.policy.UserInfoControllerImpl;

import com.android.systemui.statusbar.policy.UserSwitcherController;

import com.android.systemui.statusbar.policy.ZenModeController;

import com.android.systemui.statusbar.stack.NotificationStackScrollLayout;
@@ -319,15 +321,15 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    NetworkControllerImpl mNetworkController;

    HotspotControllerImpl mHotspotController;

    RotationLockControllerImpl mRotationLockController;

    UserInfoController mUserInfoController;

    UserInfoControllerImpl mUserInfoController;

    protected ZenModeController mZenModeController;

    CastControllerImpl mCastController;

    VolumeComponent mVolumeComponent;

    KeyguardUserSwitcher mKeyguardUserSwitcher;

    FlashlightController mFlashlightController;

    FlashlightControllerImpl mFlashlightController;

    protected UserSwitcherController mUserSwitcherController;

    NextAlarmController mNextAlarmController;

    protected KeyguardMonitor mKeyguardMonitor;

    NextAlarmControllerImpl mNextAlarmController;

    protected KeyguardMonitorImpl mKeyguardMonitor;

    BrightnessMirrorController mBrightnessMirrorController;

    AccessibilityController mAccessibilityController;

    protected FingerprintUnlockController mFingerprintUnlockController;
@@ -895,7 +897,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        if (mContext.getResources().getBoolean(R.bool.config_showRotationLock)) {

            mRotationLockController = new RotationLockControllerImpl(mContext);

        }

        mUserInfoController = new UserInfoController(mContext);

        mUserInfoController = new UserInfoControllerImpl(mContext);

        mVolumeComponent = getComponent(VolumeComponent.class);

        if (mVolumeComponent != null) {

            mZenModeController = mVolumeComponent.getZenController();
@@ -906,16 +908,16 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        initSignalCluster(mKeyguardStatusBar);

        initEmergencyCryptkeeperText();



        mFlashlightController = new FlashlightController(mContext);

        mFlashlightController = new FlashlightControllerImpl(mContext);

        mKeyguardBottomArea.setFlashlightController(mFlashlightController);

        mKeyguardBottomArea.setPhoneStatusBar(this);

        mKeyguardBottomArea.setUserSetupComplete(mUserSetup);

        mAccessibilityController = new AccessibilityController(mContext);

        mKeyguardBottomArea.setAccessibilityController(mAccessibilityController);

        mNextAlarmController = new NextAlarmController(mContext);

        mNextAlarmController = new NextAlarmControllerImpl(mContext);

        mLightStatusBarController = new LightStatusBarController(mIconController,

                mBatteryController);

        mKeyguardMonitor = new KeyguardMonitor(mContext);

        mKeyguardMonitor = new KeyguardMonitorImpl(mContext);

            mUserSwitcherController = createUserSwitcherController();

        if (UserManager.get(mContext).isUserSwitcherEnabled()) {

            createUserSwitcher();

packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ public class QSTileHost implements QSTile.Host, Tunable { 
        mBattery = battery;

        mIconController = iconController;

        mNextAlarmController = nextAlarmController;

        mProfileController = new ManagedProfileController(this);

        mProfileController = new ManagedProfileControllerImpl(this);



        mHandlerThread = new HandlerThread(QSTileHost.class.getSimpleName(),

                Process.THREAD_PRIORITY_BACKGROUND);

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java

+8 −1
Original line number Diff line number Diff line
@@ -235,11 +235,18 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements 
        mExpandIndicator.setExpanded(headerExpansionFraction > EXPAND_INDICATOR_THRESHOLD);

    }



    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        mHost.getUserInfoController().addCallback(this);

    }



    @Override

    protected void onDetachedFromWindow() {

        setListening(false);

        mHost.getUserInfoController().removeCallback(this);

        mHost.getNetworkController().removeEmergencyListener(this);

        mHost.getUserInfoController().removeCallback(this);

        super.onDetachedFromWindow();

    }
@@ -368,7 +375,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements 
    }



    public void setUserInfoController(UserInfoController userInfoController) {

        userInfoController.addCallback(this);

        // Don't care

    }



    @Override