From 2005465d09392104a6ced6ef69dbe139804bb211 Mon Sep 17 00:00:00 2001
From: tanwenkang <tanwenkang@kuaishou.com>
Date: Mon, 19 Jan 2026 20:39:15 +0800
Subject: [PATCH 1/3] Simplify HonorServiceProvider

---
 .../phantomvk/identifier/app/MainActivity.kt  | 12 ++--
 app/src/main/res/layout/activity_main.xml     | 22 +++++--
 .../provider/HonorServiceProvider.kt          | 62 +++++++------------
 3 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/app/src/main/java/com/phantomvk/identifier/app/MainActivity.kt b/app/src/main/java/com/phantomvk/identifier/app/MainActivity.kt
index ee81682..80b6a21 100644
--- a/app/src/main/java/com/phantomvk/identifier/app/MainActivity.kt
+++ b/app/src/main/java/com/phantomvk/identifier/app/MainActivity.kt
@@ -6,6 +6,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
+import android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS
 import android.util.Log
 import android.widget.Button
 import android.widget.TextView
@@ -39,10 +40,10 @@ class MainActivity : AppCompatActivity() {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_main)
     textView = findViewById(R.id.system_textview)
-    findViewById<Button>(R.id.button).setOnClickListener { getId() }
+    findViewById<Button>(R.id.refresh).setOnClickListener { getId() }
     findViewById<Button>(R.id.clear_cache).setOnClickListener { IdentifierManager.clearMemoryCache() }
-    findViewById<Button>(R.id.uninstall).setOnClickListener { uninstall() }
-    findViewById<Button>(R.id.button_settings).setOnClickListener { startActivity(Intent(this, SettingsActivity::class.java)) }
+    findViewById<Button>(R.id.appSettings).setOnClickListener { openAppDetailsSettings() }
+    findViewById<Button>(R.id.configs).setOnClickListener { startActivity(Intent(this, SettingsActivity::class.java)) }
     getId()
   }
 
@@ -191,8 +192,9 @@ class MainActivity : AppCompatActivity() {
     }
   }
 
-  private fun uninstall() {
-    val i = Intent(Intent.ACTION_DELETE, Uri.parse("package:$packageName"))
+  private fun openAppDetailsSettings() {
+    val i = Intent(ACTION_APPLICATION_DETAILS_SETTINGS)
+    i.setData(Uri.parse("package:$packageName"))
     i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
     startActivity(i)
   }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9c0f52d..924f81e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,7 +3,6 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:layout_margin="8dp"
   android:orientation="vertical"
   tools:context=".MainActivity">
 
@@ -15,9 +14,11 @@
     android:orientation="horizontal">
 
     <Button
-      android:id="@+id/button"
+      android:id="@+id/refresh"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:minWidth="0dp"
+      android:minHeight="0dp"
       android:text="Refresh"
       android:textAllCaps="false"
       android:textSize="12sp" />
@@ -26,23 +27,29 @@
       android:id="@+id/clear_cache"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:minWidth="0dp"
+      android:minHeight="0dp"
       android:text="Clear cache"
       android:textAllCaps="false"
       android:textSize="12sp" />
 
     <Button
-      android:id="@+id/uninstall"
+      android:id="@+id/appSettings"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:text="Uninstall"
+      android:minWidth="0dp"
+      android:minHeight="0dp"
+      android:text="App Settings"
       android:textAllCaps="false"
       android:textSize="12sp" />
 
     <Button
-      android:id="@+id/button_settings"
+      android:id="@+id/configs"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:text="Settings"
+      android:minWidth="0dp"
+      android:minHeight="0dp"
+      android:text="Configs"
       android:textAllCaps="false"
       android:textSize="12sp" />
   </LinearLayout>
@@ -52,6 +59,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_above="@+id/button_list"
+    android:layout_marginStart="8dp"
+    android:layout_marginTop="8dp"
+    android:layout_marginEnd="8dp"
     android:textColor="#FF000000"
     android:textSize="14sp"
     android:textStyle="bold" />
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/HonorServiceProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/HonorServiceProvider.kt
index 223933a..edf528f 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/HonorServiceProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/HonorServiceProvider.kt
@@ -15,52 +15,37 @@ internal class HonorServiceProvider(config: ProviderConfig) : AbstractProvider(c
 
   override fun run() {
     val intent = Intent("com.hihonor.id.HnOaIdService").setPackage("com.hihonor.id")
-    bindService(intent) { binder ->
-      if (config.isVerifyLimitAdTracking) {
-        isLimited(binder) { result ->
-          if (result is BinderResult.Success) {
-            getId(binder) { r -> verifyResult(r) }
-          } else {
-            verifyResult(result)
-          }
-        }
-      } else {
-        getId(binder) { r -> verifyResult(r) }
-      }
-    }
+    bindService(intent) { b -> if (config.isVerifyLimitAdTracking) callBinder(3, b) else callBinder(2, b) }
   }
 
-  private fun getId(remote: IBinder, callback: OnResultCallback) {
+  /**
+   * @param code 2:getId(), 3:isLimited()
+   * @param remote binder instance
+   */
+  private fun callBinder(code: Int, remote: IBinder) {
     val callback = object : IOAIDCallBack.Stub() {
       override fun a(i: Int, j: Long, z: Boolean, f: Float, d: Double, str: String?) {}
       override fun onResult(i: Int, bundle: Bundle?) {
-        if (i != 0 || bundle == null) {
-          callback.call(BinderResult.Failed(BUNDLE_IS_NULL))
-        } else {
-          callback.call(checkId(bundle.getString("oa_id_flag")))
-        }
-      }
-    }
-
-    callBinder(remote, callback, 2)
-  }
+        when (code) {
+          2 -> { // getId()
+            if (i == 0 && bundle != null) {
+              verifyResult(checkId(bundle.getString("oa_id_flag")))
+            } else {
+              getConsumer().onError(BUNDLE_IS_NULL)
+            }
+          }
 
-  private fun isLimited(remote: IBinder, callback: OnResultCallback) {
-    val callback = object : IOAIDCallBack.Stub() {
-      override fun a(i: Int, j: Long, z: Boolean, f: Float, d: Double, str: String?) {}
-      override fun onResult(i: Int, bundle: Bundle?) {
-        if (i == 0 && bundle?.getBoolean("oa_id_limit_state") == true) {
-          callback.call(BinderResult.Failed(LIMIT_AD_TRACKING_IS_ENABLED))
-        } else {
-          callback.call(BinderResult.Success("", "", ""))
+          3 -> { // isLimited()
+            if (i == 0 && bundle?.getBoolean("oa_id_limit_state") == true) {
+              getConsumer().onError(LIMIT_AD_TRACKING_IS_ENABLED)
+            } else {
+              callBinder(2, remote)
+            }
+          }
         }
       }
     }
 
-    callBinder(remote, callback, 3)
-  }
-
-  private fun callBinder(remote: IBinder, callback: IOAIDCallBack, code: Int) {
     val data = Parcel.obtain()
     val reply = Parcel.obtain()
     try {
@@ -69,13 +54,10 @@ internal class HonorServiceProvider(config: ProviderConfig) : AbstractProvider(c
       remote.transact(code, data, reply, 0)
       reply.readException()
     } catch (t: Throwable) {
+      getConsumer().onError(EXCEPTION_THROWN, t)
     } finally {
       reply.recycle()
       data.recycle()
     }
   }
-
-  private fun interface OnResultCallback {
-    fun call(result: BinderResult)
-  }
 }

From 3fa0f195fb86b60cd0d9647721c9988feb3a37b7 Mon Sep 17 00:00:00 2001
From: tanwenkang <tanwenkang@kuaishou.com>
Date: Mon, 19 Jan 2026 20:41:51 +0800
Subject: [PATCH 2/3] Simplify the use of BinderResult

---
 .../identifier/provider/AbstractProvider.kt   | 31 +++++++++----------
 .../identifier/provider/AsusProvider.kt       |  2 +-
 .../identifier/provider/FreemeProvider.kt     |  4 +--
 .../provider/GoogleAdsIdProvider.kt           |  2 +-
 .../identifier/provider/HuaweiBaseProvider.kt | 16 +++++-----
 .../provider/HuaweiContentProvider.kt         |  4 +--
 .../identifier/provider/HuaweiSdkProvider.kt  |  4 +--
 .../provider/HuaweiServiceProvider.kt         |  6 ++--
 .../provider/HuaweiSettingsProvider.kt        |  4 +--
 .../identifier/provider/MeizuProvider.kt      | 12 +++----
 .../identifier/provider/NubiaProvider.kt      |  8 ++---
 .../identifier/provider/OppoBaseProvider.kt   |  6 ++--
 .../provider/OppoContentProvider.kt           |  8 ++---
 .../identifier/provider/OppoHeyTapProvider.kt | 12 +++----
 .../identifier/provider/OppoIdProvider.kt     |  4 +--
 .../identifier/provider/QikuBinderProvider.kt |  6 ++--
 .../provider/QikuServiceProvider.kt           |  2 +-
 .../identifier/provider/VivoProvider.kt       |  8 ++---
 .../identifier/provider/XiaomiProvider.kt     |  4 +--
 .../identifier/provider/ZteProvider.kt        |  4 +--
 .../identifier/provider/ZuiProvider.kt        |  2 +-
 21 files changed, 74 insertions(+), 75 deletions(-)

diff --git a/library/src/main/java/com/phantomvk/identifier/provider/AbstractProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/AbstractProvider.kt
index 38160da..167851e 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/AbstractProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/AbstractProvider.kt
@@ -70,11 +70,11 @@ internal abstract class AbstractProvider(protected val config: ProviderConfig) {
     aaidCode: Int
   ): BinderResult {
     return when (val o = getId(binder, oaidCode)) {
-      is BinderResult.Failed -> o
-      is BinderResult.Success -> {
+      is Failed -> o
+      is Success -> {
         val vaid = invokeById(IdEnum.VAID) { getId(binder, vaidCode) }
         val aaid = invokeById(IdEnum.AAID) { getId(binder, aaidCode) }
-        BinderResult.Success(o.id, vaid, aaid)
+        Success(o.id, vaid, aaid)
       }
     }
   }
@@ -89,7 +89,7 @@ internal abstract class AbstractProvider(protected val config: ProviderConfig) {
       reply.readException()
       return checkId(reply.readString())
     } catch (t: Throwable) {
-      return BinderResult.Failed(EXCEPTION_THROWN, t)
+      return Failed(EXCEPTION_THROWN, t)
     } finally {
       reply.recycle()
       data.recycle()
@@ -103,20 +103,20 @@ internal abstract class AbstractProvider(protected val config: ProviderConfig) {
       else -> false
     }
 
-    return if (isEnabled) (callback.invoke() as? BinderResult.Success)?.id else null
+    return if (isEnabled) (callback.invoke() as? Success)?.id else null
   }
 
   protected fun checkId(id: String?, callback: Consumer? = null): BinderResult {
     val result = when {
-      id.isNullOrBlank() -> BinderResult.Failed(ID_IS_NULL_OR_BLANK)
-      id.any { it != '0' && it != '-' } -> BinderResult.Success(id, null, null)
-      else -> BinderResult.Failed(ID_IS_INVALID)
+      id.isNullOrBlank() -> Failed(ID_IS_NULL_OR_BLANK)
+      id.any { it != '0' && it != '-' } -> Success(id, null, null)
+      else -> Failed(ID_IS_INVALID)
     }
 
     if (callback != null) {
       when (result) {
-        is BinderResult.Failed -> callback.onError(result.msg)
-        is BinderResult.Success -> callback.onSuccess(IdentifierResult(result.id))
+        is Failed -> callback.onError(result.msg)
+        is Success -> callback.onSuccess(IdentifierResult(result.id))
       }
     }
 
@@ -143,8 +143,8 @@ internal abstract class AbstractProvider(protected val config: ProviderConfig) {
 
   protected fun verifyResult(r: BinderResult) {
     when (r) {
-      is BinderResult.Success -> getConsumer().onSuccess(IdentifierResult(r.id, r.aaid, r.vaid))
-      is BinderResult.Failed -> getConsumer().onError(r.msg, r.throwable)
+      is Success -> getConsumer().onSuccess(IdentifierResult(r.id, r.aaid, r.vaid))
+      is Failed -> getConsumer().onError(r.msg, r.throwable)
     }
   }
 
@@ -192,10 +192,9 @@ internal abstract class AbstractProvider(protected val config: ProviderConfig) {
     fun call(binder: IBinder): BinderResult
   }
 
-  protected sealed interface BinderResult {
-    class Success(val id: String, val vaid: String?, val aaid: String?) : BinderResult
-    class Failed(val msg: String, val throwable: Throwable? = null) : BinderResult
-  }
+  protected sealed interface BinderResult
+  class Success(val id: String, val vaid: String?, val aaid: String?) : BinderResult
+  class Failed(val msg: String, val throwable: Throwable? = null) : BinderResult
 
   @IntDef(IdEnum.AAID, IdEnum.VAID)
   @Retention(AnnotationRetention.SOURCE)
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/AsusProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/AsusProvider.kt
index 9fc8229..d26f2e3 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/AsusProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/AsusProvider.kt
@@ -23,7 +23,7 @@ internal class AsusProvider(config: ProviderConfig) : AbstractProvider(config) {
       override fun call(binder: IBinder): BinderResult {
         if (config.isVerifyLimitAdTracking) {
           if (!readBoolean(binder, 1, true, null)) {
-            return BinderResult.Failed(LIMIT_AD_TRACKING_IS_ENABLED)
+            return Failed(LIMIT_AD_TRACKING_IS_ENABLED)
           }
         }
 
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/FreemeProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/FreemeProvider.kt
index 6f81207..0eb658d 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/FreemeProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/FreemeProvider.kt
@@ -17,12 +17,12 @@ internal class FreemeProvider(config: ProviderConfig) : AbstractProvider(config)
       override fun call(binder: IBinder): BinderResult {
         val asInterface = IdsSupplier.Stub.asInterface(binder)
         if (asInterface == null) {
-          return BinderResult.Failed(AIDL_INTERFACE_IS_NULL)
+          return Failed(AIDL_INTERFACE_IS_NULL)
         }
 
         if (config.isVerifyLimitAdTracking) {
           if (!asInterface.isSupported) {
-            return BinderResult.Failed(LIMIT_AD_TRACKING_IS_ENABLED)
+            return Failed(LIMIT_AD_TRACKING_IS_ENABLED)
           }
         }
 
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/GoogleAdsIdProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/GoogleAdsIdProvider.kt
index 4daf5ae..f0250a2 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/GoogleAdsIdProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/GoogleAdsIdProvider.kt
@@ -25,7 +25,7 @@ internal class GoogleAdsIdProvider(config: ProviderConfig) : AbstractProvider(co
       override fun call(binder: IBinder): BinderResult {
         if (config.isVerifyLimitAdTracking) {
           if (readBoolean(binder, 2, false) { it.writeInt(1) }) {
-            return BinderResult.Failed(LIMIT_AD_TRACKING_IS_ENABLED)
+            return Failed(LIMIT_AD_TRACKING_IS_ENABLED)
           }
         }
 
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/HuaweiBaseProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/HuaweiBaseProvider.kt
index 5f0ff44..ebf9343 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/HuaweiBaseProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/HuaweiBaseProvider.kt
@@ -11,7 +11,7 @@ internal abstract class HuaweiBaseProvider(config: ProviderConfig) : AbstractPro
     }
 
     val latch = CountDownLatch(1)
-    var result: BinderResult = BinderResult.Failed(EXCEPTION_THROWN)
+    var result: BinderResult = Failed(EXCEPTION_THROWN)
 
     try {
       com.huawei.hms.aaid.HmsInstanceId.getInstance(config.context).aaid
@@ -20,16 +20,16 @@ internal abstract class HuaweiBaseProvider(config: ProviderConfig) : AbstractPro
           latch.countDown()
         }
         .addOnFailureListener { t: Throwable ->
-          result = BinderResult.Failed(EXCEPTION_THROWN, t)
+          result = Failed(EXCEPTION_THROWN, t)
           latch.countDown()
         }
     } catch (t: Throwable) {
-      result = BinderResult.Failed(EXCEPTION_THROWN, t)
+      result = Failed(EXCEPTION_THROWN, t)
       latch.countDown()
     }
 
     latch.await()
-    return (result as? BinderResult.Success)?.id
+    return (result as? Success)?.id
   }
 
   protected fun getVAID(): String? {
@@ -38,7 +38,7 @@ internal abstract class HuaweiBaseProvider(config: ProviderConfig) : AbstractPro
     }
 
     val latch = CountDownLatch(1)
-    var result: BinderResult = BinderResult.Failed(EXCEPTION_THROWN)
+    var result: BinderResult = Failed(EXCEPTION_THROWN)
 
     try {
       com.huawei.hms.opendevice.OpenDevice.getOpenDeviceClient(config.context).odid
@@ -47,15 +47,15 @@ internal abstract class HuaweiBaseProvider(config: ProviderConfig) : AbstractPro
           latch.countDown()
         }
         .addOnFailureListener { t: Throwable ->
-          result = BinderResult.Failed(EXCEPTION_THROWN, t)
+          result = Failed(EXCEPTION_THROWN, t)
           latch.countDown()
         }
     } catch (t: Throwable) {
-      result = BinderResult.Failed(EXCEPTION_THROWN, t)
+      result = Failed(EXCEPTION_THROWN, t)
       latch.countDown()
     }
 
     latch.await()
-    return (result as? BinderResult.Success)?.id
+    return (result as? Success)?.id
   }
 }
\ No newline at end of file
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/HuaweiContentProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/HuaweiContentProvider.kt
index be3dde8..a551a83 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/HuaweiContentProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/HuaweiContentProvider.kt
@@ -34,8 +34,8 @@ internal class HuaweiContentProvider(config: ProviderConfig) : HuaweiBaseProvide
       }
 
       when (val r = checkId(c.getString(code))) {
-        is BinderResult.Failed -> getConsumer().onError(r.msg, r.throwable)
-        is BinderResult.Success -> getConsumer().onSuccess(IdentifierResult(r.id, getAAID(), getVAID()))
+        is Failed -> getConsumer().onError(r.msg, r.throwable)
+        is Success -> getConsumer().onSuccess(IdentifierResult(r.id, getAAID(), getVAID()))
       }
     }
   }
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/HuaweiSdkProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/HuaweiSdkProvider.kt
index 0a71da8..fd65166 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/HuaweiSdkProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/HuaweiSdkProvider.kt
@@ -25,8 +25,8 @@ internal class HuaweiSdkProvider(config: ProviderConfig) : HuaweiBaseProvider(co
     }
 
     when (val r = checkId(info.id)) {
-      is BinderResult.Failed -> getConsumer().onError(r.msg, r.throwable)
-      is BinderResult.Success -> getConsumer().onSuccess(IdentifierResult(r.id, getAAID(), getVAID()))
+      is Failed -> getConsumer().onError(r.msg, r.throwable)
+      is Success -> getConsumer().onSuccess(IdentifierResult(r.id, getAAID(), getVAID()))
     }
   }
 }
\ No newline at end of file
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/HuaweiServiceProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/HuaweiServiceProvider.kt
index 3e30355..3640d92 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/HuaweiServiceProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/HuaweiServiceProvider.kt
@@ -38,13 +38,13 @@ internal class HuaweiServiceProvider(config: ProviderConfig) : HuaweiBaseProvide
       override fun call(binder: IBinder): BinderResult {
         if (config.isVerifyLimitAdTracking) {
           if (readBoolean(binder, 2, false, null)) {
-            return BinderResult.Failed(LIMIT_AD_TRACKING_IS_ENABLED)
+            return Failed(LIMIT_AD_TRACKING_IS_ENABLED)
           }
         }
 
         return when (val r = getId(binder, 1)) {
-          is BinderResult.Failed -> r
-          is BinderResult.Success -> BinderResult.Success(r.id, getVAID(), getAAID())
+          is Failed -> r
+          is Success -> Success(r.id, getVAID(), getAAID())
         }
       }
     })
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/HuaweiSettingsProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/HuaweiSettingsProvider.kt
index da057ec..bb5ae50 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/HuaweiSettingsProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/HuaweiSettingsProvider.kt
@@ -27,8 +27,8 @@ internal class HuaweiSettingsProvider(config: ProviderConfig) : HuaweiBaseProvid
 
     val id = Settings.Global.getString(config.context.contentResolver, "pps_oaid")
     when (val r = checkId(id)) {
-      is BinderResult.Failed -> getConsumer().onError(r.msg, r.throwable)
-      is BinderResult.Success -> getConsumer().onSuccess(IdentifierResult(r.id, getAAID(), getVAID()))
+      is Failed -> getConsumer().onError(r.msg, r.throwable)
+      is Success -> getConsumer().onSuccess(IdentifierResult(r.id, getAAID(), getVAID()))
     }
   }
 }
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/MeizuProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/MeizuProvider.kt
index bd63f0a..e97a3c4 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/MeizuProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/MeizuProvider.kt
@@ -12,8 +12,8 @@ internal class MeizuProvider(config: ProviderConfig) : AbstractProvider(config)
 
   override fun run() {
     when (val r = getId("oaid")) {
-      is BinderResult.Failed -> getConsumer().onError(r.msg, r.throwable)
-      is BinderResult.Success -> {
+      is Failed -> getConsumer().onError(r.msg, r.throwable)
+      is Success -> {
         val aaid = invokeById(IdEnum.AAID) { getId("aaid") }
         getConsumer().onSuccess(IdentifierResult(r.id, aaid))
       }
@@ -24,7 +24,7 @@ internal class MeizuProvider(config: ProviderConfig) : AbstractProvider(config)
     val uri = Uri.parse("content://com.meizu.flyme.openidsdk/")
     val cursor = config.context.contentResolver.query(uri, null, null, arrayOf(name), null)
     if (cursor == null) {
-      return BinderResult.Failed(QUERY_CURSOR_IS_NULL)
+      return Failed(QUERY_CURSOR_IS_NULL)
     }
 
     cursor.use { c ->
@@ -33,18 +33,18 @@ internal class MeizuProvider(config: ProviderConfig) : AbstractProvider(config)
       if (config.isVerifyLimitAdTracking) {
         val code = c.getColumnIndex("code")
         if (code >= 0 && c.getLong(code) == 6L) {
-          return BinderResult.Failed(LIMIT_AD_TRACKING_IS_ENABLED)
+          return Failed(LIMIT_AD_TRACKING_IS_ENABLED)
         }
 
         val expired = c.getColumnIndex("expired")
         if (expired >= 0 && c.getLong(expired) == 0L) {
-          return BinderResult.Failed(LIMIT_AD_TRACKING_IS_ENABLED)
+          return Failed(LIMIT_AD_TRACKING_IS_ENABLED)
         }
       }
 
       val index = c.getColumnIndex("value")
       if (index == -1) {
-        return BinderResult.Failed(NO_AVAILABLE_COLUMN_INDEX)
+        return Failed(NO_AVAILABLE_COLUMN_INDEX)
       }
 
       return checkId(c.getString(index))
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/NubiaProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/NubiaProvider.kt
index 95b7e68..a4af6eb 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/NubiaProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/NubiaProvider.kt
@@ -33,8 +33,8 @@ internal class NubiaProvider(config: ProviderConfig) : AbstractProvider(config)
 
     try {
       when (val r = getId(client, "getOAID")) {
-        is BinderResult.Failed -> getConsumer().onError(r.msg, r.throwable)
-        is BinderResult.Success -> {
+        is Failed -> getConsumer().onError(r.msg, r.throwable)
+        is Success -> {
           val aaid = invokeById(IdEnum.AAID) { getId(client, "getAAID") }
           val vaid = invokeById(IdEnum.VAID) { getId(client, "getVAID") }
           getConsumer().onSuccess(IdentifierResult(r.id, aaid, vaid))
@@ -50,13 +50,13 @@ internal class NubiaProvider(config: ProviderConfig) : AbstractProvider(config)
   private fun getId(client: ContentProviderClient, name: String): BinderResult {
     val bundle = client.call(name, config.context.packageName, null)
     if (bundle == null) {
-      return BinderResult.Failed(BUNDLE_IS_NULL)
+      return Failed(BUNDLE_IS_NULL)
     }
 
     return if (bundle.getInt("code", -1) == 0) {
       checkId(bundle.getString("id"))
     } else {
-      BinderResult.Failed(ID_IS_INVALID)
+      Failed(ID_IS_INVALID)
     }
   }
 }
\ No newline at end of file
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/OppoBaseProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/OppoBaseProvider.kt
index e3ed450..3a25a01 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/OppoBaseProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/OppoBaseProvider.kt
@@ -52,14 +52,14 @@ internal abstract class OppoBaseProvider(config: ProviderConfig) : AbstractProvi
   protected fun getSignatureHash(): BinderResult {
     val signature = getSignatures(config.context.packageManager, config.context.packageName)
       ?.firstOrNull()
-      ?: return BinderResult.Failed(SIGNATURE_IS_NULL)
+      ?: return Failed(SIGNATURE_IS_NULL)
 
     val byteArray = signature.toByteArray()
     val sign = sha1(byteArray)
     if (sign.isNullOrBlank()) {
-      return BinderResult.Failed(SIGNATURE_HASH_IS_NULL)
+      return Failed(SIGNATURE_HASH_IS_NULL)
     }
 
-    return BinderResult.Success(sign, null, null)
+    return Success(sign, null, null)
   }
 }
\ No newline at end of file
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/OppoContentProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/OppoContentProvider.kt
index c468978..485a31e 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/OppoContentProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/OppoContentProvider.kt
@@ -22,7 +22,7 @@ internal class OppoContentProvider(config: ProviderConfig) : OppoBaseProvider(co
     }
 
     val sign = getSignatureHash()
-    if (sign !is BinderResult.Success) {
+    if (sign !is Success) {
       releaseContentProviderClient(client)
       getConsumer().onError(SIGNATURE_HASH_IS_NULL)
       return
@@ -34,8 +34,8 @@ internal class OppoContentProvider(config: ProviderConfig) : OppoBaseProvider(co
 
     try {
       when (val r = getId(client, "OUID", extras)) {
-        is BinderResult.Failed -> getConsumer().onError(r.msg, r.throwable)
-        is BinderResult.Success -> {
+        is Failed -> getConsumer().onError(r.msg, r.throwable)
+        is Success -> {
           val aaid = invokeById(IdEnum.AAID) { getId(client, "AUID", extras) }
           getConsumer().onSuccess(IdentifierResult(r.id, aaid, null))
         }
@@ -50,7 +50,7 @@ internal class OppoContentProvider(config: ProviderConfig) : OppoBaseProvider(co
   private fun getId(client: ContentProviderClient, method: String, extras: Bundle): BinderResult {
     val bundle = client.call(method, null, extras)
     return if (bundle == null) {
-      BinderResult.Failed(BUNDLE_IS_NULL)
+      Failed(BUNDLE_IS_NULL)
     } else {
       checkId(bundle.getString(method))
     }
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/OppoHeyTapProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/OppoHeyTapProvider.kt
index 79bede0..982f69b 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/OppoHeyTapProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/OppoHeyTapProvider.kt
@@ -27,16 +27,16 @@ internal open class OppoHeyTapProvider(
     bindService(intent, object : BinderCallback {
       override fun call(binder: IBinder): BinderResult {
         val sign = when (val result = getSignatureHash()) {
-          is BinderResult.Failed -> return result
-          is BinderResult.Success -> result.id
+          is Failed -> return result
+          is Success -> result.id
         }
 
         when (val r = (getId(binder, descriptor, sign, "OAID"))) {
-          is BinderResult.Failed -> return r
-          is BinderResult.Success -> {
+          is Failed -> return r
+          is Success -> {
 //            val vaid = invokeById(IdEnum.VAID) { getId(binder, descriptor, sign, "VAID") }
             val aaid = invokeById(IdEnum.AAID) { getId(binder, descriptor, sign, "AAID") }
-            return BinderResult.Success(r.id, null, aaid)
+            return Success(r.id, null, aaid)
           }
         }
       }
@@ -63,7 +63,7 @@ internal open class OppoHeyTapProvider(
       reply.readException()
       return checkId(reply.readString())
     } catch (t: Throwable) {
-      return BinderResult.Failed(EXCEPTION_THROWN, t)
+      return Failed(EXCEPTION_THROWN, t)
     } finally {
       reply.recycle()
       data.recycle()
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/OppoIdProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/OppoIdProvider.kt
index 322aa6a..0a5a4cf 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/OppoIdProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/OppoIdProvider.kt
@@ -16,8 +16,8 @@ internal class OppoIdProvider(config: ProviderConfig) : AbstractProvider(config)
 
   override fun run() {
     when (val r = checkId(impl.getOUID(config.context))) {
-      is BinderResult.Failed -> getConsumer().onError(r.msg, r.throwable)
-      is BinderResult.Success -> {
+      is Failed -> getConsumer().onError(r.msg, r.throwable)
+      is Success -> {
         val aaid = invokeById(IdEnum.AAID) { checkId(impl.getAUID(config.context)) }
 //        val vaid = invokeById(IdEnum.VAID) { checkId(impl.getDUID(config.context)) }
         getConsumer().onSuccess(IdentifierResult(r.id, aaid, null))
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/QikuBinderProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/QikuBinderProvider.kt
index 9e13cff..48b7db1 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/QikuBinderProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/QikuBinderProvider.kt
@@ -24,8 +24,8 @@ internal class QikuBinderProvider(config: ProviderConfig) : AbstractProvider(con
     }
 
     when (val r = getId(4)) {
-      is BinderResult.Failed -> getConsumer().onError(r.msg, r.throwable)
-      is BinderResult.Success -> {
+      is Failed -> getConsumer().onError(r.msg, r.throwable)
+      is Success -> {
 //        val vaid = invokeById(IdEnum.VAID) { getId(5) }
 //        val aaid = invokeById(IdEnum.AAID) { getId(6) }
         getConsumer().onSuccess(IdentifierResult(r.id))
@@ -55,7 +55,7 @@ internal class QikuBinderProvider(config: ProviderConfig) : AbstractProvider(con
       iBinder.transact(code, data, reply, 0)
       return checkId(reply.readString())
     } catch (t: Throwable) {
-      return BinderResult.Failed(EXCEPTION_THROWN, t)
+      return Failed(EXCEPTION_THROWN, t)
     } finally {
       reply.recycle()
       data.recycle()
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/QikuServiceProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/QikuServiceProvider.kt
index 904fa15..3cefe5f 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/QikuServiceProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/QikuServiceProvider.kt
@@ -20,7 +20,7 @@ internal class QikuServiceProvider(config: ProviderConfig) : AbstractProvider(co
       override fun call(binder: IBinder): BinderResult {
         if (config.isVerifyLimitAdTracking) {
           if (readBoolean(binder, 8, false, null)) {
-            return BinderResult.Failed(LIMIT_AD_TRACKING_IS_ENABLED)
+            return Failed(LIMIT_AD_TRACKING_IS_ENABLED)
           }
         }
 
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/VivoProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/VivoProvider.kt
index 56a8a34..ad3af36 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/VivoProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/VivoProvider.kt
@@ -21,8 +21,8 @@ internal class VivoProvider(config: ProviderConfig) : AbstractProvider(config) {
     }
 
     when (val r = getId("OAID")) {
-      is BinderResult.Failed -> return getConsumer().onError(r.msg, r.throwable)
-      is BinderResult.Success -> {
+      is Failed -> return getConsumer().onError(r.msg, r.throwable)
+      is Success -> {
         val aaid = invokeById(IdEnum.AAID) { getId("AAID") }
         getConsumer().onSuccess(IdentifierResult(r.id, aaid))
       }
@@ -34,7 +34,7 @@ internal class VivoProvider(config: ProviderConfig) : AbstractProvider(config) {
     val uri = Uri.parse(prefix + config.context.packageName)
     val cursor = config.context.contentResolver.query(uri, null, null, null, null)
     if (cursor == null) {
-      return BinderResult.Failed(QUERY_CURSOR_IS_NULL)
+      return Failed(QUERY_CURSOR_IS_NULL)
     }
 
     return cursor.use { c ->
@@ -42,7 +42,7 @@ internal class VivoProvider(config: ProviderConfig) : AbstractProvider(config) {
 
       val index = c.getColumnIndex("value")
       if (index == -1) {
-        return BinderResult.Failed(NO_AVAILABLE_COLUMN_INDEX)
+        return Failed(NO_AVAILABLE_COLUMN_INDEX)
       }
 
       checkId(c.getString(index))
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/XiaomiProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/XiaomiProvider.kt
index 806e79c..e8dde74 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/XiaomiProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/XiaomiProvider.kt
@@ -18,8 +18,8 @@ internal class XiaomiProvider(config: ProviderConfig) : AbstractProvider(config)
 
   override fun run() {
     when (val r = checkId(impl.getOAID(config.context))) {
-      is BinderResult.Failed -> getConsumer().onError(r.msg, r.throwable)
-      is BinderResult.Success -> {
+      is Failed -> getConsumer().onError(r.msg, r.throwable)
+      is Success -> {
         val aaid = invokeById(IdEnum.AAID) { checkId(impl.getAAID(config.context)) }
         val vaid = invokeById(IdEnum.VAID) { checkId(impl.getVAID(config.context)) }
         getConsumer().onSuccess(IdentifierResult(r.id, aaid, vaid))
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/ZteProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/ZteProvider.kt
index 79d61ed..3146153 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/ZteProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/ZteProvider.kt
@@ -30,8 +30,8 @@ internal class ZteProvider(config: ProviderConfig) : AbstractProvider(config) {
     }
 
     when (val r = checkId(manager.getOAID(config.context))) {
-      is BinderResult.Failed -> getConsumer().onError(r.msg, r.throwable)
-      is BinderResult.Success -> {
+      is Failed -> getConsumer().onError(r.msg, r.throwable)
+      is Success -> {
         val aaid = invokeById(IdEnum.AAID) { checkId(manager.getAAID(config.context)) }
         val vaid = invokeById(IdEnum.VAID) { checkId(manager.getVAID(config.context)) }
         getConsumer().onSuccess(IdentifierResult(r.id, aaid, vaid))
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/ZuiProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/ZuiProvider.kt
index 6570393..9f52d49 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/ZuiProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/ZuiProvider.kt
@@ -20,7 +20,7 @@ internal class ZuiProvider(config: ProviderConfig) : AbstractProvider(config) {
       override fun call(binder: IBinder): BinderResult {
         if (config.isVerifyLimitAdTracking) {
           if (!readBoolean(binder, 3, true, null)) {
-            return BinderResult.Failed(LIMIT_AD_TRACKING_IS_ENABLED)
+            return Failed(LIMIT_AD_TRACKING_IS_ENABLED)
           }
         }
 

From 4f7e13c5f7f49f1ad668c9e4382c4858a47fab34 Mon Sep 17 00:00:00 2001
From: tanwenkang <tanwenkang@kuaishou.com>
Date: Tue, 20 Jan 2026 21:43:03 +0800
Subject: [PATCH 3/3] Enable AAID and VAID according to the configuration.

---
 .../identifier/provider/AbstractProvider.kt        | 14 ++------------
 .../phantomvk/identifier/provider/MeizuProvider.kt |  2 +-
 .../phantomvk/identifier/provider/NubiaProvider.kt |  4 ++--
 .../identifier/provider/OppoContentProvider.kt     |  2 +-
 .../identifier/provider/OppoHeyTapProvider.kt      |  6 +++---
 .../identifier/provider/OppoIdProvider.kt          |  6 +++---
 .../phantomvk/identifier/provider/VivoProvider.kt  |  2 +-
 .../identifier/provider/XiaomiProvider.kt          |  4 ++--
 .../phantomvk/identifier/provider/ZteProvider.kt   |  4 ++--
 9 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/library/src/main/java/com/phantomvk/identifier/provider/AbstractProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/AbstractProvider.kt
index 167851e..f4d0a69 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/AbstractProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/AbstractProvider.kt
@@ -72,8 +72,8 @@ internal abstract class AbstractProvider(protected val config: ProviderConfig) {
     return when (val o = getId(binder, oaidCode)) {
       is Failed -> o
       is Success -> {
-        val vaid = invokeById(IdEnum.VAID) { getId(binder, vaidCode) }
-        val aaid = invokeById(IdEnum.AAID) { getId(binder, aaidCode) }
+        val vaid = if (config.idConfig.isVaidEnabled) (getId(binder, vaidCode) as? Success)?.id else null
+        val aaid = if (config.idConfig.isAaidEnabled) (getId(binder, aaidCode) as? Success)?.id else null
         Success(o.id, vaid, aaid)
       }
     }
@@ -96,16 +96,6 @@ internal abstract class AbstractProvider(protected val config: ProviderConfig) {
     }
   }
 
-  protected fun invokeById(@IdEnum type: Int, callback: () -> BinderResult): String? {
-    val isEnabled = when (type) {
-      IdEnum.AAID -> config.idConfig.isAaidEnabled
-      IdEnum.VAID -> config.idConfig.isVaidEnabled
-      else -> false
-    }
-
-    return if (isEnabled) (callback.invoke() as? Success)?.id else null
-  }
-
   protected fun checkId(id: String?, callback: Consumer? = null): BinderResult {
     val result = when {
       id.isNullOrBlank() -> Failed(ID_IS_NULL_OR_BLANK)
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/MeizuProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/MeizuProvider.kt
index e97a3c4..36936f9 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/MeizuProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/MeizuProvider.kt
@@ -14,7 +14,7 @@ internal class MeizuProvider(config: ProviderConfig) : AbstractProvider(config)
     when (val r = getId("oaid")) {
       is Failed -> getConsumer().onError(r.msg, r.throwable)
       is Success -> {
-        val aaid = invokeById(IdEnum.AAID) { getId("aaid") }
+        val aaid = if (config.idConfig.isAaidEnabled) (getId("aaid") as? Success)?.id else null
         getConsumer().onSuccess(IdentifierResult(r.id, aaid))
       }
     }
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/NubiaProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/NubiaProvider.kt
index a4af6eb..be4eb68 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/NubiaProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/NubiaProvider.kt
@@ -35,8 +35,8 @@ internal class NubiaProvider(config: ProviderConfig) : AbstractProvider(config)
       when (val r = getId(client, "getOAID")) {
         is Failed -> getConsumer().onError(r.msg, r.throwable)
         is Success -> {
-          val aaid = invokeById(IdEnum.AAID) { getId(client, "getAAID") }
-          val vaid = invokeById(IdEnum.VAID) { getId(client, "getVAID") }
+          val aaid = if (config.idConfig.isAaidEnabled) (getId(client, "getAAID") as? Success)?.id else null
+          val vaid = if (config.idConfig.isVaidEnabled) (getId(client, "getVAID") as? Success)?.id else null
           getConsumer().onSuccess(IdentifierResult(r.id, aaid, vaid))
         }
       }
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/OppoContentProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/OppoContentProvider.kt
index 485a31e..6737599 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/OppoContentProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/OppoContentProvider.kt
@@ -36,7 +36,7 @@ internal class OppoContentProvider(config: ProviderConfig) : OppoBaseProvider(co
       when (val r = getId(client, "OUID", extras)) {
         is Failed -> getConsumer().onError(r.msg, r.throwable)
         is Success -> {
-          val aaid = invokeById(IdEnum.AAID) { getId(client, "AUID", extras) }
+          val aaid = if (config.idConfig.isAaidEnabled) (getId(client, "AUID", extras) as? Success)?.id else null
           getConsumer().onSuccess(IdentifierResult(r.id, aaid, null))
         }
       }
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/OppoHeyTapProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/OppoHeyTapProvider.kt
index 982f69b..336e07e 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/OppoHeyTapProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/OppoHeyTapProvider.kt
@@ -34,9 +34,9 @@ internal open class OppoHeyTapProvider(
         when (val r = (getId(binder, descriptor, sign, "OAID"))) {
           is Failed -> return r
           is Success -> {
-//            val vaid = invokeById(IdEnum.VAID) { getId(binder, descriptor, sign, "VAID") }
-            val aaid = invokeById(IdEnum.AAID) { getId(binder, descriptor, sign, "AAID") }
-            return Success(r.id, null, aaid)
+            val vaid = if (config.idConfig.isVaidEnabled) (getId(binder, descriptor, sign, "VAID") as? Success)?.id else null
+            val aaid = if (config.idConfig.isAaidEnabled) (getId(binder, descriptor, sign, "AAID") as? Success)?.id else null
+            return Success(r.id, vaid, aaid)
           }
         }
       }
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/OppoIdProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/OppoIdProvider.kt
index 0a5a4cf..5fda8f3 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/OppoIdProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/OppoIdProvider.kt
@@ -18,9 +18,9 @@ internal class OppoIdProvider(config: ProviderConfig) : AbstractProvider(config)
     when (val r = checkId(impl.getOUID(config.context))) {
       is Failed -> getConsumer().onError(r.msg, r.throwable)
       is Success -> {
-        val aaid = invokeById(IdEnum.AAID) { checkId(impl.getAUID(config.context)) }
-//        val vaid = invokeById(IdEnum.VAID) { checkId(impl.getDUID(config.context)) }
-        getConsumer().onSuccess(IdentifierResult(r.id, aaid, null))
+        val aaid = if (config.idConfig.isAaidEnabled) (checkId(impl.getAUID(config.context)) as? Success)?.id else null
+        val vaid = if (config.idConfig.isVaidEnabled) (checkId(impl.getDUID(config.context)) as? Success)?.id else null
+        getConsumer().onSuccess(IdentifierResult(r.id, aaid, vaid))
       }
     }
   }
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/VivoProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/VivoProvider.kt
index ad3af36..e43e277 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/VivoProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/VivoProvider.kt
@@ -23,7 +23,7 @@ internal class VivoProvider(config: ProviderConfig) : AbstractProvider(config) {
     when (val r = getId("OAID")) {
       is Failed -> return getConsumer().onError(r.msg, r.throwable)
       is Success -> {
-        val aaid = invokeById(IdEnum.AAID) { getId("AAID") }
+        val aaid = if (config.idConfig.isAaidEnabled) (getId("AAID") as? Success)?.id else null
         getConsumer().onSuccess(IdentifierResult(r.id, aaid))
       }
     }
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/XiaomiProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/XiaomiProvider.kt
index e8dde74..c22f100 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/XiaomiProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/XiaomiProvider.kt
@@ -20,8 +20,8 @@ internal class XiaomiProvider(config: ProviderConfig) : AbstractProvider(config)
     when (val r = checkId(impl.getOAID(config.context))) {
       is Failed -> getConsumer().onError(r.msg, r.throwable)
       is Success -> {
-        val aaid = invokeById(IdEnum.AAID) { checkId(impl.getAAID(config.context)) }
-        val vaid = invokeById(IdEnum.VAID) { checkId(impl.getVAID(config.context)) }
+        val aaid = if (config.idConfig.isAaidEnabled) (checkId(impl.getAAID(config.context)) as? Success)?.id else null
+        val vaid = if (config.idConfig.isVaidEnabled) (checkId(impl.getVAID(config.context)) as? Success)?.id else null
         getConsumer().onSuccess(IdentifierResult(r.id, aaid, vaid))
       }
     }
diff --git a/library/src/main/java/com/phantomvk/identifier/provider/ZteProvider.kt b/library/src/main/java/com/phantomvk/identifier/provider/ZteProvider.kt
index 3146153..fe0f2ae 100644
--- a/library/src/main/java/com/phantomvk/identifier/provider/ZteProvider.kt
+++ b/library/src/main/java/com/phantomvk/identifier/provider/ZteProvider.kt
@@ -32,8 +32,8 @@ internal class ZteProvider(config: ProviderConfig) : AbstractProvider(config) {
     when (val r = checkId(manager.getOAID(config.context))) {
       is Failed -> getConsumer().onError(r.msg, r.throwable)
       is Success -> {
-        val aaid = invokeById(IdEnum.AAID) { checkId(manager.getAAID(config.context)) }
-        val vaid = invokeById(IdEnum.VAID) { checkId(manager.getVAID(config.context)) }
+        val aaid = if (config.idConfig.isAaidEnabled) (checkId(manager.getAAID(config.context)) as? Success)?.id else null
+        val vaid = if (config.idConfig.isVaidEnabled) (checkId(manager.getVAID(config.context)) as? Success)?.id else null
         getConsumer().onSuccess(IdentifierResult(r.id, aaid, vaid))
       }
     }