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

Commit 4211f843 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Call notifyRecentTasksChanged when device locks/unlocks" into main

parents 5d76f33e d355d35d

libs/WindowManager/Shell/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    <uses-permission android:name="android.permission.ROTATE_SURFACE_FLINGER" />

    <uses-permission android:name="android.permission.WAKEUP_SURFACE_FLINGER" />

    <uses-permission android:name="android.permission.READ_FRAME_BUFFER" />

    <uses-permission android:name="android.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE" />



    <application>

        <activity

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java

+6 −0
Original line number Diff line number Diff line
@@ -21,9 +21,12 @@ import static android.content.pm.PackageManager.FEATURE_PC; 


import static com.android.wm.shell.shared.ShellSharedConstants.KEY_EXTRA_SHELL_RECENT_TASKS;



import android.Manifest;

import android.annotation.RequiresPermission;

import android.app.ActivityManager;

import android.app.ActivityTaskManager;

import android.app.IApplicationThread;

import android.app.KeyguardManager;

import android.app.PendingIntent;

import android.content.ComponentName;

import android.content.Context;
@@ -158,6 +161,7 @@ public class RecentTasksController implements TaskStackListenerCallback, 
        return new IRecentTasksImpl(this);

    }



    @RequiresPermission(Manifest.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE)

    private void onInit() {

        mShellController.addExternalInterface(KEY_EXTRA_SHELL_RECENT_TASKS,

                this::createExternalInterface, this);
@@ -168,6 +172,8 @@ public class RecentTasksController implements TaskStackListenerCallback, 
            mTaskStackTransitionObserver.addTaskStackTransitionObserverListener(this,

                    mMainExecutor);

        }

        mContext.getSystemService(KeyguardManager.class).addKeyguardLockedStateListener(

                mMainExecutor, isKeyguardLocked -> notifyRecentTasksChanged());

    }



    void setTransitionHandler(RecentsTransitionHandler handler) {

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import static java.lang.Integer.MAX_VALUE; 


import android.app.ActivityManager;

import android.app.ActivityTaskManager;

import android.app.KeyguardManager;

import android.content.ComponentName;

import android.content.Context;

import android.content.pm.PackageManager;
@@ -136,6 +137,8 @@ public class RecentTasksControllerTest extends ShellTestCase { 


        mMainExecutor = new TestShellExecutor();

        when(mContext.getPackageManager()).thenReturn(mock(PackageManager.class));

        when(mContext.getSystemService(KeyguardManager.class))

                .thenReturn(mock(KeyguardManager.class));

        mShellInit = spy(new ShellInit(mMainExecutor));

        mShellController = spy(new ShellController(mContext, mShellInit, mShellCommandHandler,

                mDisplayInsetsController, mMainExecutor));