commit 86e251eba60d6dc2cf7afe7ae536d12f4858c857
author Helen Qin <helenqin@google.com> Tue Jun 25 01:50:48 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 25 01:50:48 2024 +0000
tree 07cb0a0a50a3a8dece837588a434ace915703a70
parent b767fcb0496819c44df53cf2179dd2d9431af430
parent 43bacd617d0741081bd4216504adccf42a75baa5

Merge "Account for runtime component enabled state to check if OEM UI is enabled." into main

core/java/android/credentials/selection/IntentFactory.java

diff --git a/core/java/android/credentials/selection/IntentFactory.java b/core/java/android/credentials/selection/IntentFactory.java
index b98a0d8..c521b96 100644
--- a/core/java/android/credentials/selection/IntentFactory.java
+++ b/core/java/android/credentials/selection/IntentFactory.java
@@ -232,7 +232,17 @@
                             oemComponentName,
                             PackageManager.ComponentInfoFlags.of(
                                     PackageManager.MATCH_SYSTEM_ONLY));
-                    if (info.enabled && info.exported) {
+                    boolean oemComponentEnabled = info.enabled;
+                    int runtimeComponentEnabledState = context.getPackageManager()
+                          .getComponentEnabledSetting(oemComponentName);
+                    if (runtimeComponentEnabledState == PackageManager
+                          .COMPONENT_ENABLED_STATE_ENABLED) {
+                          oemComponentEnabled = true;
+                    } else if (runtimeComponentEnabledState == PackageManager
+                          .COMPONENT_ENABLED_STATE_DISABLED) {
+                        oemComponentEnabled = false;
+                    }
+                    if (oemComponentEnabled && info.exported) {
                         intentResultBuilder.setOemUiUsageStatus(IntentCreationResult
                                 .OemUiUsageStatus.SUCCESS);
                         Slog.i(TAG,