diff --git a/src/com/android/settings/network/ims/ImsQueryController.java b/src/com/android/settings/network/ims/ImsQueryController.java
index f48fc6afee3..fec862b383e 100644
--- a/src/com/android/settings/network/ims/ImsQueryController.java
+++ b/src/com/android/settings/network/ims/ImsQueryController.java
@@ -47,13 +47,15 @@ abstract class ImsQueryController {
         mTransportType = transportType;
     }
 
+    abstract boolean isEnabledByUser(int subId);
+
     @VisibleForTesting
-    ImsQuery isTtyOnVolteEnabled(int subId) {
-        return new ImsQueryTtyOnVolteStat(subId);
+    boolean isTtyOnVolteEnabled(int subId) {
+        return (new ImsQueryTtyOnVolteStat(subId)).query();
     }
 
     @VisibleForTesting
-    ImsQuery isProvisionedOnDevice(int subId) {
-        return new ImsQueryProvisioningStat(subId, mCapability, mTech);
+    boolean isProvisionedOnDevice(int subId) {
+        return (new ImsQueryProvisioningStat(subId, mCapability, mTech)).query();
     }
 }
diff --git a/src/com/android/settings/network/ims/VolteQueryImsState.java b/src/com/android/settings/network/ims/VolteQueryImsState.java
index 608768a29a1..23f8bab081b 100644
--- a/src/com/android/settings/network/ims/VolteQueryImsState.java
+++ b/src/com/android/settings/network/ims/VolteQueryImsState.java
@@ -55,8 +55,8 @@ public class VolteQueryImsState extends ImsQueryController {
      * Implementation of ImsQueryController#isEnabledByUser(int subId)
      */
     @VisibleForTesting
-    ImsQuery isEnabledByUser(int subId) {
-        return new ImsQueryEnhanced4gLteModeUserSetting(subId);
+    boolean isEnabledByUser(int subId) {
+        return (new ImsQueryEnhanced4gLteModeUserSetting(subId)).query();
     }
 
     @VisibleForTesting
@@ -77,7 +77,7 @@ public class VolteQueryImsState extends ImsQueryController {
         }
 
         return imsManager.isVolteEnabledByPlatform()
-                && isProvisionedOnDevice(mSubId).query();
+                && isProvisionedOnDevice(mSubId);
     }
 
     /**
@@ -101,7 +101,7 @@ public class VolteQueryImsState extends ImsQueryController {
         }
 
         return ((!isTtyEnabled(mContext))
-                || (isTtyOnVolteEnabled(mSubId).query()));
+                || (isTtyOnVolteEnabled(mSubId)));
     }
 
     @VisibleForTesting
@@ -119,6 +119,6 @@ public class VolteQueryImsState extends ImsQueryController {
         if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
             return false;
         }
-        return isEnabledByUser(mSubId).query();
+        return isEnabledByUser(mSubId);
     }
 }
diff --git a/src/com/android/settings/network/ims/VtQueryImsState.java b/src/com/android/settings/network/ims/VtQueryImsState.java
index a9003b1215d..60bd72988e3 100644
--- a/src/com/android/settings/network/ims/VtQueryImsState.java
+++ b/src/com/android/settings/network/ims/VtQueryImsState.java
@@ -55,8 +55,8 @@ public class VtQueryImsState extends ImsQueryController {
      * Implementation of ImsQueryController#isEnabledByUser(int subId)
      */
     @VisibleForTesting
-    ImsQuery isEnabledByUser(int subId) {
-        return new ImsQueryVtUserSetting(subId);
+    boolean isEnabledByUser(int subId) {
+        return (new ImsQueryVtUserSetting(subId)).query();
     }
 
     @VisibleForTesting
@@ -77,7 +77,7 @@ public class VtQueryImsState extends ImsQueryController {
         }
 
         return imsManager.isVtEnabledByPlatform()
-                && isProvisionedOnDevice(mSubId).query()
+                && isProvisionedOnDevice(mSubId)
                 && MobileNetworkUtils.isImsServiceStateReady(imsManager);
     }
 
@@ -91,7 +91,7 @@ public class VtQueryImsState extends ImsQueryController {
             return false;
         }
         return ((!isTtyEnabled(mContext))
-                || (isTtyOnVolteEnabled(mSubId).query()));
+                || (isTtyOnVolteEnabled(mSubId)));
     }
 
     @VisibleForTesting
@@ -109,6 +109,6 @@ public class VtQueryImsState extends ImsQueryController {
         if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
             return false;
         }
-        return isEnabledByUser(mSubId).query();
+        return isEnabledByUser(mSubId);
     }
 }
diff --git a/src/com/android/settings/network/ims/WifiCallingQueryImsState.java b/src/com/android/settings/network/ims/WifiCallingQueryImsState.java
index ab0bc8c885d..1667b7f9804 100644
--- a/src/com/android/settings/network/ims/WifiCallingQueryImsState.java
+++ b/src/com/android/settings/network/ims/WifiCallingQueryImsState.java
@@ -55,8 +55,8 @@ public class WifiCallingQueryImsState extends ImsQueryController  {
      * Implementation of ImsQueryController#isEnabledByUser(int subId)
      */
     @VisibleForTesting
-    ImsQuery isEnabledByUser(int subId) {
-        return new ImsQueryWfcUserSetting(subId);
+    boolean isEnabledByUser(int subId) {
+        return (new ImsQueryWfcUserSetting(subId)).query();
     }
 
     @VisibleForTesting
@@ -77,7 +77,7 @@ public class WifiCallingQueryImsState extends ImsQueryController  {
         }
 
         return imsManager.isWfcEnabledByPlatform()
-                && isProvisionedOnDevice(mSubId).query();
+                && isProvisionedOnDevice(mSubId);
     }
 
     /**
@@ -101,7 +101,7 @@ public class WifiCallingQueryImsState extends ImsQueryController  {
         }
 
         return ((!isTtyEnabled(mContext))
-                || (isTtyOnVolteEnabled(mSubId).query()));
+                || (isTtyOnVolteEnabled(mSubId)));
     }
 
     @VisibleForTesting
@@ -119,6 +119,6 @@ public class WifiCallingQueryImsState extends ImsQueryController  {
         if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
             return false;
         }
-        return isEnabledByUser(mSubId).query();
+        return isEnabledByUser(mSubId);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/network/ims/MockImsQueryResult.java b/tests/robotests/src/com/android/settings/network/ims/MockImsQueryResult.java
deleted file mode 100644
index d2a7129a127..00000000000
--- a/tests/robotests/src/com/android/settings/network/ims/MockImsQueryResult.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.ims;
-
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class MockImsQueryResult {
-
-    public static class BooleanResult implements ImsQuery {
-        private boolean mResult;
-
-        public BooleanResult(boolean result) {
-            super();
-            mResult = result;
-        }
-
-        public boolean query() {
-            return mResult;
-        }
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/network/ims/MockVolteQueryImsState.java b/tests/robotests/src/com/android/settings/network/ims/MockVolteQueryImsState.java
index 42ddd7006a9..84399a2db48 100644
--- a/tests/robotests/src/com/android/settings/network/ims/MockVolteQueryImsState.java
+++ b/tests/robotests/src/com/android/settings/network/ims/MockVolteQueryImsState.java
@@ -27,9 +27,9 @@ import com.android.ims.ImsManager;
  */
 public class MockVolteQueryImsState extends VolteQueryImsState {
 
-    private ImsQuery mIsTtyOnVolteEnabled;
-    private ImsQuery mIsProvisionedOnDevice;
-    private ImsQuery mIsEnabledByUser;
+    private Boolean mIsTtyOnVolteEnabled;
+    private Boolean mIsProvisionedOnDevice;
+    private Boolean mIsEnabledByUser;
 
     /**
      * Constructor
@@ -46,11 +46,11 @@ public class MockVolteQueryImsState extends VolteQueryImsState {
     }
 
     public void setIsTtyOnVolteEnabled(boolean enabled) {
-        mIsTtyOnVolteEnabled = new MockImsQueryResult.BooleanResult(enabled);
+        mIsTtyOnVolteEnabled = enabled;
     }
 
     @Override
-    ImsQuery isTtyOnVolteEnabled(int subId) {
+    boolean isTtyOnVolteEnabled(int subId) {
         if (mIsTtyOnVolteEnabled != null) {
             return mIsTtyOnVolteEnabled;
         }
@@ -58,11 +58,11 @@ public class MockVolteQueryImsState extends VolteQueryImsState {
     }
 
     public void setIsProvisionedOnDevice(boolean isProvisioned) {
-        mIsProvisionedOnDevice = new MockImsQueryResult.BooleanResult(isProvisioned);
+        mIsProvisionedOnDevice = isProvisioned;
     }
 
     @Override
-    ImsQuery isProvisionedOnDevice(int subId) {
+    boolean isProvisionedOnDevice(int subId) {
         if (mIsProvisionedOnDevice != null) {
             return mIsProvisionedOnDevice;
         }
@@ -70,11 +70,11 @@ public class MockVolteQueryImsState extends VolteQueryImsState {
     }
 
     public void setIsEnabledByUser(boolean enabled) {
-        mIsEnabledByUser = new MockImsQueryResult.BooleanResult(enabled);
+        mIsEnabledByUser = enabled;
     }
 
     @Override
-    ImsQuery isEnabledByUser(int subId) {
+    boolean isEnabledByUser(int subId) {
         if (mIsEnabledByUser != null) {
             return mIsEnabledByUser;
         }
diff --git a/tests/robotests/src/com/android/settings/network/ims/MockVtQueryImsState.java b/tests/robotests/src/com/android/settings/network/ims/MockVtQueryImsState.java
index b5971e9db1c..4fd7d0c6dfb 100644
--- a/tests/robotests/src/com/android/settings/network/ims/MockVtQueryImsState.java
+++ b/tests/robotests/src/com/android/settings/network/ims/MockVtQueryImsState.java
@@ -26,9 +26,9 @@ import com.android.ims.ImsManager;
  */
 public class MockVtQueryImsState extends VtQueryImsState {
 
-    private ImsQuery mIsTtyOnVolteEnabled;
-    private ImsQuery mIsProvisionedOnDevice;
-    private ImsQuery mIsEnabledByUser;
+    private Boolean mIsTtyOnVolteEnabled;
+    private Boolean mIsProvisionedOnDevice;
+    private Boolean mIsEnabledByUser;
 
     /**
      * Constructor
@@ -45,11 +45,11 @@ public class MockVtQueryImsState extends VtQueryImsState {
     }
 
     public void setIsTtyOnVolteEnabled(boolean enabled) {
-        mIsTtyOnVolteEnabled = new MockImsQueryResult.BooleanResult(enabled);
+        mIsTtyOnVolteEnabled = enabled;
     }
 
     @Override
-    ImsQuery isTtyOnVolteEnabled(int subId) {
+    boolean isTtyOnVolteEnabled(int subId) {
         if (mIsTtyOnVolteEnabled != null) {
             return mIsTtyOnVolteEnabled;
         }
@@ -57,11 +57,11 @@ public class MockVtQueryImsState extends VtQueryImsState {
     }
 
     public void setIsProvisionedOnDevice(boolean isProvisioned) {
-        mIsProvisionedOnDevice = new MockImsQueryResult.BooleanResult(isProvisioned);
+        mIsProvisionedOnDevice = isProvisioned;
     }
 
     @Override
-    ImsQuery isProvisionedOnDevice(int subId) {
+    boolean isProvisionedOnDevice(int subId) {
         if (mIsProvisionedOnDevice != null) {
             return mIsProvisionedOnDevice;
         }
@@ -69,11 +69,11 @@ public class MockVtQueryImsState extends VtQueryImsState {
     }
 
     public void setIsEnabledByUser(boolean enabled) {
-        mIsEnabledByUser = new MockImsQueryResult.BooleanResult(enabled);
+        mIsEnabledByUser = enabled;
     }
 
     @Override
-    ImsQuery isEnabledByUser(int subId) {
+    boolean isEnabledByUser(int subId) {
         if (mIsEnabledByUser != null) {
             return mIsEnabledByUser;
         }
diff --git a/tests/robotests/src/com/android/settings/network/ims/MockWifiCallingQueryImsState.java b/tests/robotests/src/com/android/settings/network/ims/MockWifiCallingQueryImsState.java
index aa30aa0444a..8123c935b1a 100644
--- a/tests/robotests/src/com/android/settings/network/ims/MockWifiCallingQueryImsState.java
+++ b/tests/robotests/src/com/android/settings/network/ims/MockWifiCallingQueryImsState.java
@@ -26,9 +26,9 @@ import com.android.ims.ImsManager;
  */
 public class MockWifiCallingQueryImsState extends WifiCallingQueryImsState {
 
-    private ImsQuery mIsTtyOnVolteEnabled;
-    private ImsQuery mIsProvisionedOnDevice;
-    private ImsQuery mIsEnabledByUser;
+    private Boolean mIsTtyOnVolteEnabled;
+    private Boolean mIsProvisionedOnDevice;
+    private Boolean mIsEnabledByUser;
 
     /**
      * Constructor
@@ -45,11 +45,11 @@ public class MockWifiCallingQueryImsState extends WifiCallingQueryImsState {
     }
 
     public void setIsTtyOnVolteEnabled(boolean enabled) {
-        mIsTtyOnVolteEnabled = new MockImsQueryResult.BooleanResult(enabled);
+        mIsTtyOnVolteEnabled = enabled;
     }
 
     @Override
-    ImsQuery isTtyOnVolteEnabled(int subId) {
+    boolean isTtyOnVolteEnabled(int subId) {
         if (mIsTtyOnVolteEnabled != null) {
             return mIsTtyOnVolteEnabled;
         }
@@ -57,11 +57,11 @@ public class MockWifiCallingQueryImsState extends WifiCallingQueryImsState {
     }
 
     public void setIsProvisionedOnDevice(boolean isProvisioned) {
-        mIsProvisionedOnDevice = new MockImsQueryResult.BooleanResult(isProvisioned);
+        mIsProvisionedOnDevice = isProvisioned;
     }
 
     @Override
-    ImsQuery isProvisionedOnDevice(int subId) {
+    boolean isProvisionedOnDevice(int subId) {
         if (mIsProvisionedOnDevice != null) {
             return mIsProvisionedOnDevice;
         }
@@ -69,11 +69,11 @@ public class MockWifiCallingQueryImsState extends WifiCallingQueryImsState {
     }
 
     public void setIsEnabledByUser(boolean enabled) {
-        mIsEnabledByUser = new MockImsQueryResult.BooleanResult(enabled);
+        mIsEnabledByUser = enabled;
     }
 
     @Override
-    ImsQuery isEnabledByUser(int subId) {
+    boolean isEnabledByUser(int subId) {
         if (mIsEnabledByUser != null) {
             return mIsEnabledByUser;
         }