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

Commit 82ff8a55 authored by Govinda Wasserman's avatar Govinda Wasserman Committed by android-build-merger
Browse files

Merge "Adds timestamp to Assistant invocation bundles." into qt-dev 

am: b231a53d

Change-Id: I510a28caf255618d112f04ae0cb2c11b0686076a
parents d7fc5d1c b231a53d

packages/SystemUI/src/com/android/systemui/assist/AssistManager.java

+10 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.os.Binder; 
import android.os.Bundle;

import android.os.Handler;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.UserHandle;

import android.provider.Settings;

import android.service.voice.VoiceInteractionSession;
@@ -54,6 +55,14 @@ public class AssistManager implements ConfigurationChangedReceiver { 


    private static final String ASSIST_ICON_METADATA_NAME =

            "com.android.systemui.action_assist_icon";

    private static final String INVOCATION_TIME_MS_KEY = "invocation_time_ms";

    public static final String INVOCATION_TYPE_KEY = "invocation_type";



    public static final int INVOCATION_TYPE_GESTURE = 1;

    public static final int INVOCATION_TYPE_ACTIVE_EDGE = 2;

    public static final int INVOCATION_TYPE_VOICE = 3;

    public static final int INVOCATION_TYPE_QUICK_SEARCH_BAR = 4;

    public static final int INVOCATION_HOME_BUTTON_LONG_PRESS = 5;



    private static final long TIMEOUT_SERVICE = 2500;

    private static final long TIMEOUT_ACTIVITY = 1000;
@@ -171,6 +180,7 @@ public class AssistManager implements ConfigurationChangedReceiver { 
                    ? TIMEOUT_SERVICE

                    : TIMEOUT_ACTIVITY);

        }

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

        startAssistInternal(args, assistComponent, isService);

    }