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

Unverified Commit c2b5b7ab authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-security-15.0.0_r12' into staging/lineage-22.2_merge-android-security-15.0.0_r12 

Android security 15.0.0 release 12

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaS3hJwAKCRDorT+BmrEO
# eGB4AJsFK+jEpZAlEj3ANsjIlegYDTKlzQCfY6q8WX661Hyz3yLlR1GGOiSlH0M=
# =pVAw
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Dec  1 20:40:39 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By Tony Wickham
# Via Android Build Coastguard Worker
* tag 'android-security-15.0.0_r12':
  Send KEYCODE_HOME for home button instead of startActivity directly

 Conflicts:
	quickstep/src/com/android/quickstep/OverviewCommandHelper.java
	quickstep/src/com/android/quickstep/SystemUiProxy.java

Change-Id: I4d509c6c53db6b6b18578d63b4e9a9530d1e6f7a
parents 91bef4be 52ce305f

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

+11 −0
Original line number Diff line number Diff line
@@ -223,6 +223,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 injectLongPress(int keyCode) {

        if (mSystemUiProxy != null) {

quickstep/src/com/android/quickstep/TouchInteractionService.java

+2 −1
Original line number Diff line number Diff line
@@ -725,7 +725,8 @@ public class TouchInteractionService extends Service { 
        mTaskAnimationManager = new TaskAnimationManager(this, mRecentsWindowManager);

        mOverviewComponentObserver = OverviewComponentObserver.INSTANCE.get(this);

        mOverviewCommandHelper = new OverviewCommandHelper(this,

                mOverviewComponentObserver, mTaskAnimationManager);

                mOverviewComponentObserver, mTaskAnimationManager,

                SystemUiProxy.INSTANCE.get(this));

        mResetGestureInputConsumer = new ResetGestureInputConsumer(

                mTaskAnimationManager, mTaskbarManager::getCurrentActivityContext);

        mInputConsumer.registerInputConsumer();