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

Commit e9c4adfa authored by Vincent Wang's avatar Vincent Wang
Browse files

Remove package biometric2 from AOSP settings 

Flag: EXEMPT Remove legacy code from AOSP
Bug: 351977012
Test: Build pass
Change-Id: I2285ab8cc2776071c329d7432849aeffc28ed8ee
parent 3e393d0a

AndroidManifest.xml

+0 −14
Original line number Diff line number Diff line
@@ -2800,20 +2800,6 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".biometrics2.ui.view.FingerprintEnrollmentActivity"

            android:exported="true"

            android:theme="@style/GlifTheme.Light" />



        <activity android:name=".biometrics2.ui.view.FingerprintEnrollmentActivity$InternalActivity"

            android:exported="false"

            android:theme="@style/GlifTheme.Light"

            android:taskAffinity="com.android.settings.root" />



        <activity android:name=".biometrics2.ui.view.FingerprintEnrollmentActivity$SetupActivity"

            android:exported="true"

            android:permission="android.permission.MANAGE_FINGERPRINT"

            android:theme="@style/GlifTheme.Light" />



        <activity android:name=".biometrics.fingerprint.FingerprintEnrollIntroductionInternal"

                  android:exported="false"

                  android:theme="@style/GlifTheme.Light"

src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java

+0 −3
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import com.android.settings.biometrics.face.FaceEnrollIntroductionInternal; 
import com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling;

import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction;

import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroductionInternal;

import com.android.settings.biometrics2.ui.view.FingerprintEnrollmentActivity;

import com.android.settings.core.FeatureFlags;

import com.android.settings.homepage.DeepLinkHomepageActivity;

import com.android.settings.homepage.DeepLinkHomepageActivityInternal;
@@ -255,8 +254,6 @@ public class ActivityEmbeddingRulesController { 
                    .buildSearchIntent(mContext, SettingsEnums.SETTINGS_HOMEPAGE);

            addActivityFilter(activityFilters, searchIntent);

        }

        addActivityFilter(activityFilters, FingerprintEnrollmentActivity.class);

        addActivityFilter(activityFilters, FingerprintEnrollmentActivity.InternalActivity.class);

        addActivityFilter(activityFilters, FingerprintEnrollIntroduction.class);

        addActivityFilter(activityFilters, FingerprintEnrollIntroductionInternal.class);

        addActivityFilter(activityFilters, FingerprintEnrollEnrolling.class);

src/com/android/settings/biometrics/BiometricUtils.java

+4 −24
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings.biometrics;



import static android.util.FeatureFlagUtils.SETTINGS_BIOMETRICS2_ENROLLMENT;



import android.annotation.IntDef;

import android.app.Activity;
@@ -33,7 +32,6 @@ import android.os.Bundle; 
import android.os.storage.StorageManager;

import android.text.BidiFormatter;

import android.text.SpannableStringBuilder;

import android.util.FeatureFlagUtils;

import android.util.Log;

import android.view.Surface;
@@ -50,7 +48,6 @@ import com.android.settings.biometrics.fingerprint.FingerprintEnrollFindSensor; 
import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction;

import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor;

import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroduction;

import com.android.settings.biometrics2.ui.view.FingerprintEnrollmentActivity;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.password.ChooseLockGeneric;

import com.android.settings.password.ChooseLockSettingsHelper;
@@ -254,17 +251,8 @@ public class BiometricUtils { 
    public static Intent getFingerprintFindSensorIntent(@NonNull Context context,

            @NonNull Intent activityIntent) {

        final boolean isSuw =  WizardManagerHelper.isAnySetupWizard(activityIntent);

        final Intent intent;

        if (FeatureFlagUtils.isEnabled(context, SETTINGS_BIOMETRICS2_ENROLLMENT)) {

            intent = new Intent(context, isSuw

                    ? FingerprintEnrollmentActivity.SetupActivity.class

                    : FingerprintEnrollmentActivity.class);

            intent.putExtra(BiometricEnrollActivity.EXTRA_SKIP_INTRO, true);

        } else {

            intent = new Intent(context, isSuw

                    ? SetupFingerprintEnrollFindSensor.class

                    : FingerprintEnrollFindSensor.class);

        }

        final Intent intent = new Intent(context, isSuw

                ? SetupFingerprintEnrollFindSensor.class : FingerprintEnrollFindSensor.class);

        if (isSuw) {

            SetupWizardUtils.copySetupExtras(activityIntent, intent);

        }
@@ -279,16 +267,8 @@ public class BiometricUtils { 
    public static Intent getFingerprintIntroIntent(@NonNull Context context,

            @NonNull Intent activityIntent) {

        final boolean isSuw = WizardManagerHelper.isAnySetupWizard(activityIntent);

        final Intent intent;

        if (FeatureFlagUtils.isEnabled(context, SETTINGS_BIOMETRICS2_ENROLLMENT)) {

            intent = new Intent(context, isSuw

                    ? FingerprintEnrollmentActivity.SetupActivity.class

                    : FingerprintEnrollmentActivity.class);

        } else {

            intent = new Intent(context, isSuw

                    ? SetupFingerprintEnrollIntroduction.class

                    : FingerprintEnrollIntroduction.class);

        }

        final Intent intent = new Intent(context, isSuw

                ? SetupFingerprintEnrollIntroduction.class : FingerprintEnrollIntroduction.class);

        if (isSuw) {

            WizardManagerHelper.copyWizardManagerExtras(activityIntent, intent);

        }

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

+3 −18
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import android.os.UserManager; 
import android.text.InputFilter;

import android.text.Spanned;

import android.text.TextUtils;

import android.util.FeatureFlagUtils;

import android.util.Log;

import android.view.View;

import android.widget.ImeAwareEditText;
@@ -69,8 +68,6 @@ import com.android.settings.Utils; 
import com.android.settings.biometrics.BiometricEnrollBase;

import com.android.settings.biometrics.BiometricUtils;

import com.android.settings.biometrics.GatekeeperPasswordProvider;

import com.android.settings.biometrics2.ui.model.EnrollmentRequest;

import com.android.settings.biometrics2.ui.view.FingerprintEnrollmentActivity;

import com.android.settings.core.SettingsBaseActivity;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.settings.dashboard.DashboardFragment;
@@ -801,15 +798,8 @@ public class FingerprintSettings extends SubSettings { 
            if (KEY_FINGERPRINT_ADD.equals(key)) {

                mIsEnrolling = true;

                Intent intent = new Intent();

                if (FeatureFlagUtils.isEnabled(getContext(),

                        FeatureFlagUtils.SETTINGS_BIOMETRICS2_ENROLLMENT)) {

                    intent.setClassName(SETTINGS_PACKAGE_NAME,

                            FingerprintEnrollmentActivity.InternalActivity.class.getName());

                    intent.putExtra(EnrollmentRequest.EXTRA_SKIP_FIND_SENSOR, true);

                } else {

                intent.setClassName(SETTINGS_PACKAGE_NAME,

                        FingerprintEnrollEnrolling.class.getName());

                }

                intent.putExtra(Intent.EXTRA_USER_ID, mUserId);

                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);

                if (mCalibrator != null) {
@@ -1087,12 +1077,7 @@ public class FingerprintSettings extends SubSettings { 
        private void addFirstFingerprint(@Nullable Long gkPwHandle) {

            Intent intent = new Intent();

            intent.setClassName(SETTINGS_PACKAGE_NAME,

                    FeatureFlagUtils.isEnabled(getActivity(),

                            FeatureFlagUtils.SETTINGS_BIOMETRICS2_ENROLLMENT)

                            ? FingerprintEnrollmentActivity.InternalActivity.class.getName()

                            : FingerprintEnrollIntroductionInternal.class.getName()

            );



                    FingerprintEnrollIntroductionInternal.class.getName());

            intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, true);

            intent.putExtra(SettingsBaseActivity.EXTRA_PAGE_TRANSITION_TYPE,

                    SettingsTransitionHelper.TransitionType.TRANSITION_SLIDE);

src/com/android/settings/biometrics2/OWNERS

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
# The Android Biometric team should approve all changes to biometrics2 subdirectories.

set noparent



include /src/com/android/settings/biometrics/OWNERS