Merge "Fix a bug where the AiAi service was auto-destroyed due to binder timeout." into tm-dev

2022-03-11 01:09:35 +00:00
parent b671e11e93 5ac7cdfdd3
commit 426cc57836
1 changed files with 6 additions and 0 deletions
--- a/services/core/java/com/android/server/ambientcontext/RemoteAmbientContextDetectionService.java
+++ b/services/core/java/com/android/server/ambientcontext/RemoteAmbientContextDetectionService.java
@@ -49,6 +49,12 @@ final class RemoteAmbientContextDetectionService
        connect();
    }

+    @Override
+    protected long getAutoDisconnectTimeoutMs() {
+        // Disable automatic unbinding.
+        return -1;
+    }
+
    /**
     * Asks the implementation to start detection.
     *