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

Commit 1efd64a5 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Automerger Merge Worker
Browse files

Merge "Fix User Switch Timeout Issue" into main am: fe9c3c82 

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



Change-Id: I7074409d3f9409954dbf535e090f7db9ae7e1e1f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ca9b1a45 fe9c3c82

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

+7 −1
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 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;
@@ -57,6 +59,7 @@ 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 =
@@ -107,13 +110,16 @@ 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, mMainExecutor);

        mUserTracker.addCallback(mUserChangedCallback,

                  new HandlerExecutor(mHandlerThread.getThreadHandler()));

    }



    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, mainExecutor)

            userTracker.addCallback(userTrackerCallback, backgroundExecutor)

            loadSavedComponents()

        }

    }

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

+7 −1
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 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;
@@ -92,6 +94,7 @@ 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];
@@ -150,6 +153,8 @@ public class PowerUI implements CoreStartable, CommandQueue.Callbacks { 
        mPowerManager = powerManager;

        mWakefulnessLifecycle = wakefulnessLifecycle;

        mUserTracker = userTracker;

        mHandlerThread = new HandlerThread("PowerUI");

        mHandlerThread.start();

    }



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

        updateBatteryWarningLevels();

        mReceiver.init();

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

        mUserTracker.addCallback(mUserChangedCallback,

                    new HandlerExecutor(mHandlerThread.getThreadHandler()));

        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, new HandlerExecutor(mMainHandler));

        mUserTracker.addCallback(mUserChangedCallback, mBgExecutor);



        deviceProvisionedController.addCallback(new DeviceProvisionedListener() {

            @Override

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

+5 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 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
@@ -84,6 +85,7 @@ 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) {
@@ -151,7 +153,9 @@ class KeyguardNotificationVisibilityProviderImpl @Inject constructor( 
                notifyStateChanged("onStatusBarUpcomingStateChanged")

            }

        })

        userTracker.addCallback(userTrackerCallback, HandlerExecutor(handler))

        handlerThread.start()

        userTracker.addCallback(userTrackerCallback,

                   HandlerExecutor(handlerThread.getThreadHandler()))

    }



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