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

Commit 6a23803f authored by Govinda Wasserman's avatar Govinda Wasserman Committed by Automerger Merge Worker
Browse files

Merge "Adds Assistant invocation time stamp to ActivityManagerWraper" into rvc-dev am: f90980db 

Change-Id: I118f03590c9c047918c2184837f2c96e2495b757
parents b635c88d f90980db

packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java

+6 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import android.os.IBinder; 
import android.os.Looper;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.UserHandle;

import android.provider.Settings;

import android.util.Log;
@@ -78,6 +79,9 @@ public class ActivityManagerWrapper { 
    public static final String CLOSE_SYSTEM_WINDOWS_REASON_RECENTS = "recentapps";

    public static final String CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY = "homekey";



    // Should match the value in AssistManager

    private static final String INVOCATION_TIME_MS_KEY = "invocation_time_ms";



    private final PackageManager mPackageManager;

    private final BackgroundExecutor mBackgroundExecutor;

    private final TaskStackChangeListeners mTaskStackChangeListeners;
@@ -511,6 +515,8 @@ public class ActivityManagerWrapper { 
        if (service == null) {

            return false;

        }

        args.putLong(INVOCATION_TIME_MS_KEY, SystemClock.elapsedRealtime());



        try {

            return service.showSessionFromSession(token, args, flags);

        } catch (RemoteException e) {