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

Commit a0b939b3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove com.android.server.biometrics.biometric_scheduler_fix flag" into main

parents ac8741d1 7c27d3da

services/core/java/com/android/server/biometrics/biometrics.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -32,16 +32,6 @@ flag { 
  bug: "380800403"

}



flag {

  name: "biometric_scheduler_fix"

  namespace: "biometrics_framework"

  description: "This flag fixes a bug where watchdog is ineffective when user switching is required."

  bug: "420939050"

  metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

  name: "biometric_prompt_external_display"

  namespace: "biometrics_framework"

services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java

+1 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.modules.expresslog.Counter;

import com.android.server.biometrics.BiometricSchedulerProto;

import com.android.server.biometrics.BiometricsProto;

import com.android.server.biometrics.Flags;

import com.android.server.biometrics.sensors.fingerprint.GestureAvailabilityDispatcher;



import java.io.PrintWriter;
@@ -316,7 +315,7 @@ public class BiometricScheduler<T, U> { 
        final int currentUserId = mCurrentUserRetriever.get();

        final int nextUserId = mPendingOperations.getFirst().getTargetUserId();

        final boolean shouldStartNextOperationIfMarkedCancelling =

                Flags.biometricSchedulerFix() && mPendingOperations.getFirst().isMarkedCanceling();

                mPendingOperations.getFirst().isMarkedCanceling();



        if (nextUserId == currentUserId || mPendingOperations.getFirst().isStartUserOperation()

                || shouldStartNextOperationIfMarkedCancelling) {

services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerTest.java

+0 −3
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import android.os.RemoteException; 
import android.os.UserHandle;

import android.os.test.TestLooper;

import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.testing.AndroidTestingRunner;
@@ -67,7 +66,6 @@ import androidx.annotation.Nullable; 
import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;



import com.android.server.biometrics.Flags;

import com.android.server.biometrics.log.BiometricContext;

import com.android.server.biometrics.log.BiometricLogger;

import com.android.server.biometrics.nano.BiometricSchedulerProto;
@@ -804,7 +802,6 @@ public class BiometricSchedulerTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_BIOMETRIC_SCHEDULER_FIX)

    public void testBiometricQueueHung_watchdogTriggered_noUserSwitch() {

        final int currentUserId = mCurrentUserId;

        final int newUserId = 10;