From 404c72567e1cbace650e2671539c3b6f980d1a60 Mon Sep 17 00:00:00 2001
From: Ahaan Ugale <augale@google.com>
Date: Fri, 27 Jan 2023 02:36:31 +0000
Subject: [PATCH] Fix bootloop from BIND_SHARED_ISOLATED_PROCESS without
 manifest change.

Ibb68532435cdd1fba724010b538ecf065c517b0c added the binding flag but
without a corresponding Service definition change, it causes a
SecurityException that crashes the device.

This is a temporary quick-fix to just disable the behavior. It breaks
the LookAndTalk feature but that isn't enabled anyway.

Test: manual
Fix: 266853654
Change-Id: I1a7938370a9aa3017cb0d630177083107fd1c165
---
 .../server/voiceinteraction/HotwordDetectionConnection.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java
index 591e35a49be6a..a7681b44d8369 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java
@@ -681,8 +681,7 @@ final class HotwordDetectionConnection {
                 }
                 boolean bindResult = mContext.bindIsolatedService(
                         mIntent,
-                        Context.BIND_SHARED_ISOLATED_PROCESS | Context.BIND_AUTO_CREATE
-                                | Context.BIND_FOREGROUND_SERVICE | mBindingFlags,
+                        Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE | mBindingFlags,
                         "hotword_detector_" + mInstanceNumber,
                         mExecutor,
                         serviceConnection);