commit 9c61b2649bc20e98ebf88b986239a4c98cd8c64e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Nov 15 20:25:07 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 15 20:25:07 2024 +0000
tree b4c6bf1ec79c4b110d91bd170e2e4e9c47641c70
parent 8c3a23ae66dc649ce87e4abc83418af42df37e88
parent b1ead4b0cb5096d8452815504320b1daf826da38

Merge "Increase reliability of Teleservice tests." into main

tests/src/com/android/TestContext.java

diff --git a/tests/src/com/android/TestContext.java b/tests/src/com/android/TestContext.java
index fe88ae6..bf7832a 100644
--- a/tests/src/com/android/TestContext.java
+++ b/tests/src/com/android/TestContext.java
@@ -29,6 +29,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
 import android.content.res.AssetManager;
 import android.content.res.Resources;
@@ -296,6 +297,11 @@
         }
     }
 
+    @Override
+    public void unbindService(ServiceConnection conn) {
+        // Override the base implementation to ensure we don't crash.
+    }
+
     public void grantPermission(String permission) {
         synchronized (mPermissionTable) {
             if (permission == null) return;