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

Commit 7d7bf93f authored by Austin Delgado's avatar Austin Delgado Committed by Automerger Merge Worker
Browse files

Merge "Remove unused Udfps overlay" into udc-qpr-dev am: a2ae9e64 am: d854777c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23752723



Change-Id: Ifc642fa25b8ef5f4ae3f0ad5150f7eadcfcc8608
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0219041 d854777c

core/java/android/hardware/fingerprint/FingerprintManager.java

+0 −17
Original line number Diff line number Diff line
@@ -979,23 +979,6 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing 
        }

    }



    /**

     * @hide

     */

    @RequiresPermission(USE_BIOMETRIC_INTERNAL)

    public void setUdfpsOverlay(@NonNull IUdfpsOverlay controller) {

        if (mService == null) {

            Slog.w(TAG, "setUdfpsOverlay: no fingerprint service");

            return;

        }



        try {

            mService.setUdfpsOverlay(controller);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Forwards BiometricStateListener to FingerprintService

     * @param listener new BiometricStateListener being added

core/java/android/hardware/fingerprint/IFingerprintService.aidl

+0 −5
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.hardware.fingerprint.IFingerprintAuthenticatorsRegisteredCallback 
import android.hardware.fingerprint.IFingerprintServiceReceiver;

import android.hardware.fingerprint.IUdfpsOverlayController;

import android.hardware.fingerprint.ISidefpsController;

import android.hardware.fingerprint.IUdfpsOverlay;

import android.hardware.fingerprint.Fingerprint;

import android.hardware.fingerprint.FingerprintAuthenticateOptions;

import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
@@ -203,10 +202,6 @@ interface IFingerprintService { 
    @EnforcePermission("USE_BIOMETRIC_INTERNAL")

    void setSidefpsController(in ISidefpsController controller);



    // Sets the controller for managing the UDFPS overlay.

    @EnforcePermission("USE_BIOMETRIC_INTERNAL")

    void setUdfpsOverlay(in IUdfpsOverlay controller);



    // Registers BiometricStateListener.

    @EnforcePermission("USE_BIOMETRIC_INTERNAL")

    void registerBiometricStateListener(IBiometricStateListener listener);

core/java/android/hardware/fingerprint/IUdfpsOverlay.aidl

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.hardware.fingerprint;



/**

 * Interface for interacting with the under-display fingerprint sensor (UDFPS) overlay.

 * @hide

 */

oneway interface IUdfpsOverlay {

    // Shows the overlay.

    void show(long requestId, int sensorId, int reason);



    // Hides the overlay.

    void hide(int sensorId);

}

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

+2 −10
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ import com.android.systemui.biometrics.udfps.NormalizedTouchData; 
import com.android.systemui.biometrics.udfps.SinglePointerTouchProcessor;

import com.android.systemui.biometrics.udfps.TouchProcessor;

import com.android.systemui.biometrics.udfps.TouchProcessorResult;

import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor;

import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.doze.DozeReceiver;
@@ -82,9 +84,7 @@ import com.android.systemui.dump.DumpManager; 
import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.keyguard.ScreenLifecycle;

import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor;

import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor;

import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor;

import com.android.systemui.log.SessionTracker;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.statusbar.StatusBarStateController;
@@ -260,10 +260,6 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
        @Override

        public void showUdfpsOverlay(long requestId, int sensorId, int reason,

                @NonNull IUdfpsOverlayControllerCallback callback) {

            if (mFeatureFlags.isEnabled(Flags.NEW_UDFPS_OVERLAY)) {

                return;

            }



            mFgExecutor.execute(() -> UdfpsController.this.showUdfpsOverlay(

                    new UdfpsControllerOverlay(mContext, mFingerprintManager, mInflater,

                            mWindowManager, mAccessibilityManager, mStatusBarStateController,
@@ -281,10 +277,6 @@ public class UdfpsController implements DozeReceiver, Dumpable { 


        @Override

        public void hideUdfpsOverlay(int sensorId) {

            if (mFeatureFlags.isEnabled(Flags.NEW_UDFPS_OVERLAY)) {

                return;

            }



            mFgExecutor.execute(() -> {

                if (mKeyguardUpdateMonitor.isFingerprintDetectionRunning()) {

                    // if we get here, we expect keyguardUpdateMonitor's fingerprintRunningState

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −6
Original line number Diff line number Diff line
@@ -151,12 +151,6 @@ object Flags { 
    // TODO(b/255607168): Tracking Bug

    @JvmField val DOZING_MIGRATION_1 = unreleasedFlag(213, "dozing_migration_1")



    // TODO(b/252897742): Tracking Bug

    @JvmField val NEW_ELLIPSE_DETECTION = unreleasedFlag(214, "new_ellipse_detection")



    // TODO(b/252897742): Tracking Bug

    @JvmField val NEW_UDFPS_OVERLAY = unreleasedFlag(215, "new_udfps_overlay")



    /**

     * Whether to enable the code powering customizable lock screen quick affordances.

     *