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

Commit 0b9632dd authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '3862-a15-december' into 'v3.3-a15' 

Integrate December Security patch

See merge request e/os/BlissLauncher3!152
parents 66d19346 75ce2031

libs/classes.jar

+60.8 KiB (42.9 MiB)

File changed.

No diff preview for this file type.

View original file
View changed file

libs/framework.jar

+256 B (19 MiB)

File changed.

No diff preview for this file type.

View original file
View changed file

quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa 
                logEvent(LAUNCHER_TASKBAR_HOME_BUTTON_TAP);

                mContextualEduStatsManager.updateEduStats(/* isTrackpadGesture= */ false,

                        GestureType.HOME);

                mSystemUiProxy.injectPress(KeyEvent.KEYCODE_HOME);

                mSystemUiProxy.onKeyEvent(KeyEvent.KEYCODE_HOME);

                break;

            case BUTTON_RECENTS:

                logEvent(LAUNCHER_TASKBAR_OVERVIEW_BUTTON_TAP);

quickstep/src/com/android/quickstep/OverviewCommandHelper.kt

+3 −5
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.graphics.PointF 
import android.os.SystemClock

import android.os.Trace

import android.util.Log

import android.view.KeyEvent

import android.view.View

import androidx.annotation.BinderThread

import androidx.annotation.UiThread
@@ -69,6 +70,7 @@ constructor( 
    private val overviewComponentObserver: OverviewComponentObserver,

    private val taskAnimationManager: TaskAnimationManager,

    private val dispatcherProvider: DispatcherProvider = ProductionDispatchers,

    private val systemUiProxy: SystemUiProxy,

) {

    private val coroutineScope = CoroutineScope(SupervisorJob() + dispatcherProvider.background)
@@ -303,11 +305,7 @@ constructor( 
                }

            HOME -> {

                ActiveGestureProtoLogProxy.logExecuteHomeCommand()

                // Although IActivityTaskManager$Stub$Proxy.startActivity is a slow binder call,

                // we should still call it on main thread because launcher is waiting for

                // ActivityTaskManager to resume it. Also calling startActivity() on bg thread

                // could potentially delay resuming launcher. See b/348668521 for more details.

                touchInteractionService.startActivity(overviewComponentObserver.homeIntent)

                systemUiProxy.onKeyEvent(KeyEvent.KEYCODE_HOME)

                return true

            }

            SHOW ->

quickstep/src/com/android/quickstep/SystemUiProxy.java

+6 −6
Original line number Diff line number Diff line
@@ -224,23 +224,23 @@ public class SystemUiProxy implements ISystemUiProxy, NavHandle { 
    }



    @Override

    public void injectLongPress(int keyCode) {

    public void onKeyEvent(int keycode) {

        if (mSystemUiProxy != null) {

            try {

                mSystemUiProxy.injectLongPress(keyCode);

                mSystemUiProxy.onKeyEvent(keycode);

            } catch (RemoteException e) {

                Log.w(TAG, "Failed call injectLongPress", e);

                Log.w(TAG, "Failed call onKeyEvent", e);

            }

        }

    }



    @Override

    public void injectPress(int keyCode) {

    public void injectLongPress(int keyCode) {

        if (mSystemUiProxy != null) {

            try {

                mSystemUiProxy.injectPress(keyCode);

                mSystemUiProxy.injectLongPress(keyCode);

            } catch (RemoteException e) {

                Log.w(TAG, "Failed call injectPress", e);

                Log.w(TAG, "Failed call injectLongPress", e);

            }

        }

    }