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

Commit 44d2d1b2 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Merge branch '3862-a14-december' into 'a14'

December security patch

See merge request e/os/BlissLauncher3!150
parents 8e87c13d e6df7bf8
Loading
Loading
Loading
Loading
Loading
+181 B (3.23 MiB)

File changed.

No diff preview for this file type.

+3.96 KiB (30.3 MiB)

File changed.

No diff preview for this file type.

+2.1 KiB (17.5 MiB)

File changed.

No diff preview for this file type.

+6 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.Intent;
import android.graphics.PointF;
import android.os.SystemClock;
import android.os.Trace;
import android.view.KeyEvent;
import android.view.View;

import androidx.annotation.BinderThread;
@@ -70,6 +71,7 @@ public class OverviewCommandHelper {
    private final TouchInteractionService mService;
    private final OverviewComponentObserver mOverviewComponentObserver;
    private final TaskAnimationManager mTaskAnimationManager;
    private final SystemUiProxy mSystemUiProxy;
    private final ArrayList<CommandInfo> mPendingCommands = new ArrayList<>();

    /**
@@ -89,10 +91,12 @@ public class OverviewCommandHelper {

    public OverviewCommandHelper(TouchInteractionService service,
            OverviewComponentObserver observer,
            TaskAnimationManager taskAnimationManager) {
            TaskAnimationManager taskAnimationManager,
            SystemUiProxy systemUiProxy) {
        mService = service;
        mOverviewComponentObserver = observer;
        mTaskAnimationManager = taskAnimationManager;
        mSystemUiProxy = systemUiProxy;
    }

    /**
@@ -230,7 +234,7 @@ public class OverviewCommandHelper {
                case TYPE_HOME:
                    ActiveGestureLog.INSTANCE.addLog(
                            "OverviewCommandHelper.executeCommand(TYPE_HOME)");
                    mService.startActivity(mOverviewComponentObserver.getHomeIntent());
                    mSystemUiProxy.onKeyEvent(KeyEvent.KEYCODE_HOME);
                    return true;
                case TYPE_SHOW:
                    // When Recents is not currently visible, the command's type is TYPE_SHOW
+11 −0
Original line number Diff line number Diff line
@@ -210,6 +210,17 @@ public class SystemUiProxy implements ISystemUiProxy, NavHandle {
        }
    }

    @Override
    public void onKeyEvent(int keycode) {
        if (mSystemUiProxy != null) {
            try {
                mSystemUiProxy.onKeyEvent(keycode);
            } catch (RemoteException e) {
                Log.w(TAG, "Failed call onKeyEvent", e);
            }
        }
    }

    @Override
    public void onImeSwitcherPressed() {
        if (mSystemUiProxy != null) {
Loading