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

Change-Id: I118f03590c9c047918c2184837f2c96e2495b757
This commit is contained in:
Govinda Wasserman
2020-05-21 19:26:13 +00:00
committed by Automerger Merge Worker

View File

@@ -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) {