commit bc31df3ae32abbcebbf2fc4240fe4e85c3e83c7c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Oct 07 17:21:39 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 07 17:21:39 2024 +0000
tree b853f7db91cbb161933a2c58e8db02e9d93a0daa
parent b0ca066853221b78bb10757d230f200103e38d9d
parent c6ddac557d9c1c43c1256e41ce85688d55eeb02c

Merge "Unit test fix for display-aware PowerManager API" into main

tests/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelectorTest.java

diff --git a/tests/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelectorTest.java b/tests/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelectorTest.java
index 8a83ab0..51493d3 100644
--- a/tests/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelectorTest.java
+++ b/tests/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelectorTest.java
@@ -127,6 +127,7 @@
 import android.testing.TestableLooper;
 import android.util.Log;
 import android.util.SparseArray;
+import android.view.Display;
 
 import androidx.test.filters.SmallTest;
 
@@ -230,6 +231,11 @@
             public Resources getResources() {
                 return mResources;
             }
+
+            @Override
+            public int getDisplayId() {
+                return Display.DEFAULT_DISPLAY;
+            }
         };
 
         if (Looper.myLooper() == null) {