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

Commit 41f9bdb1 authored by Josh Yang's avatar Josh Yang Committed by Android (Google) Code Review
Browse files

Merge "Initialize compose lifecycle for BiometricPrompt for wear" into main

parents 6ed4b73f cc0b7929

core/java/android/hardware/biometrics/flags.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -100,3 +100,13 @@ flag { 
  description: "This flag is for the integration of Identity Check with Watch"

  bug: "397954948"

}



flag {

  name: "bp_initialize_compose_watch"

  namespace: "wear_frameworks"

  description: "Initialize lifecycle to enable compose to run outside activities"

  bug: "414859063"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java

+2 −2
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ public class AuthContainerView extends LinearLayout 
            return;

        }



        if (Flags.bpFallbackOptions()) {

        if (Flags.bpFallbackOptions() || Flags.bpInitializeComposeWatch()) {

            ComposeInitializer.INSTANCE.onAttachedToWindow(this);

        }
@@ -574,7 +574,7 @@ public class AuthContainerView extends LinearLayout 
            findOnBackInvokedDispatcher().unregisterOnBackInvokedCallback(mBackCallback);

        }

        super.onDetachedFromWindow();

        if (Flags.bpFallbackOptions()) {

        if (Flags.bpFallbackOptions() || Flags.bpInitializeComposeWatch()) {

            ComposeInitializer.INSTANCE.onDetachedFromWindow(this);

        }

        mWakefulnessLifecycle.removeObserver(this);