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

Commit d8c2bd8e authored by Yasin Kilicdere's avatar Yasin Kilicdere
Browse files

Revert "Fix User Switch Timeout Issue" 

This reverts commit a7baceff.

Reason for revert: b/322666316

Bug: b/319352292#comment8

Change-Id: I0b66c5149284498f45b2b01fe68c959de18f5886
Merged-In: I37a94bffcfe8278a609caa485675bee693ec8773
parent 0cdab078

packages/SystemUI/src/com/android/systemui/GuestResumeSessionReceiver.java

+1 −7
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ import android.app.AlertDialog; 
import android.content.Context;

import android.content.DialogInterface;

import android.content.pm.UserInfo;

import android.os.HandlerExecutor;

import android.os.HandlerThread;

import android.os.UserHandle;



import androidx.annotation.NonNull;
@@ -59,7 +57,6 @@ public class GuestResumeSessionReceiver { 
    private final SecureSettings mSecureSettings;

    private final ResetSessionDialog.Factory mResetSessionDialogFactory;

    private final GuestSessionNotification mGuestSessionNotification;

    private final HandlerThread mHandlerThread;



    @VisibleForTesting

    public final UserTracker.Callback mUserChangedCallback =
@@ -110,16 +107,13 @@ public class GuestResumeSessionReceiver { 
        mSecureSettings = secureSettings;

        mGuestSessionNotification = guestSessionNotification;

        mResetSessionDialogFactory = resetSessionDialogFactory;

        mHandlerThread = new HandlerThread("GuestResumeSessionReceiver");

        mHandlerThread.start();

    }



    /**

     * Register this receiver with the {@link BroadcastDispatcher}

     */

    public void register() {

        mUserTracker.addCallback(mUserChangedCallback,

                  new HandlerExecutor(mHandlerThread.getThreadHandler()));

        mUserTracker.addCallback(mUserChangedCallback, mMainExecutor);

    }



    private void cancelDialog() {

packages/SystemUI/src/com/android/systemui/media/controls/resume/MediaResumeListener.kt

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ constructor( 
                null,

                UserHandle.ALL

            )

            userTracker.addCallback(userTrackerCallback, backgroundExecutor)

            userTracker.addCallback(userTrackerCallback, mainExecutor)

            loadSavedComponents()

        }

    }

packages/SystemUI/src/com/android/systemui/power/PowerUI.java

+1 −7
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ import android.content.res.Configuration; 
import android.database.ContentObserver;

import android.os.BatteryManager;

import android.os.Handler;

import android.os.HandlerExecutor;

import android.os.HandlerThread;

import android.os.IThermalEventListener;

import android.os.IThermalService;

import android.os.PowerManager;
@@ -94,7 +92,6 @@ public class PowerUI implements CoreStartable, CommandQueue.Callbacks { 
    private Future mLastShowWarningTask;

    private boolean mEnableSkinTemperatureWarning;

    private boolean mEnableUsbTemperatureAlarm;

    private final HandlerThread mHandlerThread;



    private int mLowBatteryAlertCloseLevel;

    private final int[] mLowBatteryReminderLevels = new int[2];
@@ -153,8 +150,6 @@ public class PowerUI implements CoreStartable, CommandQueue.Callbacks { 
        mPowerManager = powerManager;

        mWakefulnessLifecycle = wakefulnessLifecycle;

        mUserTracker = userTracker;

        mHandlerThread = new HandlerThread("PowerUI");

        mHandlerThread.start();

    }



    public void start() {
@@ -173,8 +168,7 @@ public class PowerUI implements CoreStartable, CommandQueue.Callbacks { 
                false, obs, UserHandle.USER_ALL);

        updateBatteryWarningLevels();

        mReceiver.init();

        mUserTracker.addCallback(mUserChangedCallback,

                    new HandlerExecutor(mHandlerThread.getThreadHandler()));

        mUserTracker.addCallback(mUserChangedCallback, mContext.getMainExecutor());

        mWakefulnessLifecycle.addObserver(mWakefulnessObserver);



        // Check to see if we need to let the user know that the phone previously shut down due

packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
        // AIRPLANE_MODE_CHANGED is sent at boot; we've probably already missed it

        updateAirplaneMode(true /* force callback */);

        mUserTracker = userTracker;

        mUserTracker.addCallback(mUserChangedCallback, mBgExecutor);

        mUserTracker.addCallback(mUserChangedCallback, new HandlerExecutor(mMainHandler));



        deviceProvisionedController.addCallback(new DeviceProvisionedListener() {

            @Override

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/KeyguardNotificationVisibilityProvider.kt

+1 −5
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ import android.database.ContentObserver 
import android.net.Uri

import android.os.Handler

import android.os.HandlerExecutor

import android.os.HandlerThread

import android.os.UserHandle

import android.provider.Settings

import com.android.keyguard.KeyguardUpdateMonitor
@@ -85,7 +84,6 @@ class KeyguardNotificationVisibilityProviderImpl @Inject constructor( 
            secureSettings.getUriFor(Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS)

    private val onStateChangedListeners = ListenerSet<Consumer<String>>()

    private var hideSilentNotificationsOnLockscreen: Boolean = false

    private val handlerThread: HandlerThread = HandlerThread("KeyguardNotificationVis")



    private val userTrackerCallback = object : UserTracker.Callback {

        override fun onUserChanged(newUser: Int, userContext: Context) {
@@ -153,9 +151,7 @@ class KeyguardNotificationVisibilityProviderImpl @Inject constructor( 
                notifyStateChanged("onStatusBarUpcomingStateChanged")

            }

        })

        handlerThread.start()

        userTracker.addCallback(userTrackerCallback,

                   HandlerExecutor(handlerThread.getThreadHandler()))

        userTracker.addCallback(userTrackerCallback, HandlerExecutor(handler))

    }



    override fun addOnStateChangedListener(listener: Consumer<String>) {