Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86e251eb authored by Helen Qin's avatar Helen Qin Committed by Android (Google) Code Review
Browse files

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

parents b767fcb0 43bacd61

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

+11 −1
Original line number Diff line number Diff line
@@ -232,7 +232,17 @@ public class IntentFactory { 
                            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,