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

Commit 6cc53743 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #20672970: Notifications are not dismissed on hot word detection" into mnc-dev

parents 47e9b148 4e88bcd3

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -28805,6 +28805,7 @@ package android.service.voice { 
  public class VoiceInteractionSession implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback {

    ctor public VoiceInteractionSession(android.content.Context);

    ctor public VoiceInteractionSession(android.content.Context, android.os.Handler);

    method public void closeSystemDialogs();

    method public void finish();

    method public android.content.Context getContext();

    method public android.view.LayoutInflater getLayoutInflater();

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30959,6 +30959,7 @@ package android.service.voice { 
  public class VoiceInteractionSession implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback {

    ctor public VoiceInteractionSession(android.content.Context);

    ctor public VoiceInteractionSession(android.content.Context, android.os.Handler);

    method public void closeSystemDialogs();

    method public void finish();

    method public android.content.Context getContext();

    method public android.view.LayoutInflater getLayoutInflater();

core/java/android/service/voice/VoiceInteractionSession.java

+15 −0
Original line number Diff line number Diff line
@@ -1000,6 +1000,21 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall 
        }

    }



    /**

     * Request that all system dialogs (and status bar shade etc) be closed, allowing

     * access to the session's UI.  This will <em>not</em> cause the lock screen to be

     * dismissed.

     */

    public void closeSystemDialogs() {

        if (mToken == null) {

            throw new IllegalStateException("Can't call before onCreate()");

        }

        try {

            mSystemService.closeSystemDialogs(mToken);

        } catch (RemoteException e) {

        }

    }



    /**

     * Convenience for inflating views.

     */

core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ interface IVoiceInteractionManagerService { 
    boolean hideSessionFromSession(IBinder token);

    int startVoiceActivity(IBinder token, in Intent intent, String resolvedType);

    void setKeepAwake(IBinder token, boolean keepAwake);

    void closeSystemDialogs(IBinder token);

    void finish(IBinder token);



    /**

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −2
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ package com.android.server.am; 














import static android.Manifest.permission.INTERACT_ACROSS_USERS;















import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;













import static android.Manifest.permission.READ_EXTERNAL_STORAGE;















import static android.Manifest.permission.START_TASKS_FROM_RECENTS;













import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;















import static android.content.pm.PackageManager.PERMISSION_GRANTED;















import static com.android.internal.util.XmlUtils.readBooleanAttribute;















import static com.android.internal.util.XmlUtils.readIntAttribute;