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

Commit 7e34c2a4 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 3e246e22: Fix issue #20494208: Go out of device idle when headset button is pressed 

* commit '3e246e22':
  Fix issue #20494208: Go out of device idle when headset button is pressed
parents b2c67b9d 3e246e22

android/app/AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -58,6 +58,7 @@ 
    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />

    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />

    <uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />

    <uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />

    <uses-permission android:name="android.permission.VIBRATE" />

    <uses-permission android:name="android.permission.VIBRATE" />

    <uses-permission android:name="android.permission.DEVICE_POWER" />





    <!-- For PBAP Owner Vcard Info -->

    <!-- For PBAP Owner Vcard Info -->

    <uses-permission android:name="android.permission.READ_PROFILE"/>

    <uses-permission android:name="android.permission.READ_PROFILE"/>

android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ import android.content.ActivityNotFoundException; 
import android.media.AudioManager;

import android.media.AudioManager;

import android.net.Uri;

import android.net.Uri;

import android.os.IBinder;

import android.os.IBinder;

import android.os.IDeviceIdleController;

import android.os.Message;

import android.os.Message;

import android.os.ParcelUuid;

import android.os.ParcelUuid;

import android.os.RemoteException;

import android.os.RemoteException;
@@ -2168,6 +2169,14 @@ final class HeadsetStateMachine extends StateMachine { 
            if (!isVirtualCallInProgress() &&

            if (!isVirtualCallInProgress() &&

                !isInCall())

                !isInCall())

            {

            {

                IDeviceIdleController dic = IDeviceIdleController.Stub.asInterface(

                        ServiceManager.getService(Context.DEVICE_IDLE_CONTROLLER));

                if (dic != null) {

                    try {

                        dic.exitIdle("voice-command");

                    } catch (RemoteException e) {

                    }

                }

                try {

                try {

                    mService.startActivity(sVoiceCommandIntent);

                    mService.startActivity(sVoiceCommandIntent);

                } catch (ActivityNotFoundException e) {

                } catch (ActivityNotFoundException e) {