1 files changed, 11 insertions, 8 deletions
diff --git a/tests/integration/signature/android/net/ip/IpClientSignatureTest.kt b/tests/integration/signature/android/net/ip/IpClientSignatureTest.kt
index 2f91f4fd..f4010730 100644
--- a/tests/integration/signature/android/net/ip/IpClientSignatureTest.kt
+++ b/tests/integration/signature/android/net/ip/IpClientSignatureTest.kt
@@ -33,10 +33,14 @@ import org.mockito.Mockito.verify
  * Tests for IpClient, run with signature permissions.
  */
 class IpClientSignatureTest : IpClientIntegrationTestCommon() {
+    companion object {
+        private val TAG = IpClientSignatureTest::class.java.simpleName
+    }
+
     private val DEFAULT_NUD_SOLICIT_NUM_POST_ROAM = 5
     private val DEFAULT_NUD_SOLICIT_NUM_STEADY_STATE = 10
 
-    private val mEnabledFeatures = ArrayMap<String, Boolean>()
+    private val mDeviceConfigProperties = ArrayMap<String, String>()
 
     override fun makeIIpClient(ifaceName: String, cb: IIpClientCallbacks): IIpClient {
         return mIpc.makeConnector()
@@ -45,21 +49,20 @@ class IpClientSignatureTest : IpClientIntegrationTestCommon() {
     override fun useNetworkStackSignature() = true
 
     override fun isFeatureEnabled(name: String): Boolean {
-        return mEnabledFeatures.get(name) ?: false
+        return FEATURE_ENABLED.equals(getDeviceConfigProperty(name))
     }
 
     override fun isFeatureNotChickenedOut(name: String): Boolean {
-        return mEnabledFeatures.get(name) ?: true
+        return !FEATURE_DISABLED.equals(getDeviceConfigProperty(name))
     }
 
-    override fun setFeatureEnabled(name: String, enabled: Boolean) {
-        mEnabledFeatures.put(name, enabled)
+    override fun setDeviceConfigProperty(name: String, value: String) {
+        mDeviceConfigProperties.put(name, value)
     }
 
-    override fun setDeviceConfigProperty(name: String, value: Int) {
-        mDependencies.setDeviceConfigProperty(name, value)
+    override fun getDeviceConfigProperty(name: String): String? {
+        return mDeviceConfigProperties.get(name)
     }
-
     override fun getStoredNetworkAttributes(l2Key: String, timeout: Long): NetworkAttributes {
         val networkAttributesCaptor = ArgumentCaptor.forClass(NetworkAttributes::class.java)