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

Commit d071eb87 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE crash during setup flow" into sc-dev am: fc6e9c8e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13779503

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I581c6f966860fec099e42311adce55731382814d
parents 74310265 fc6e9c8e

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

+1 −6
Original line number Diff line number Diff line
@@ -18,22 +18,18 @@ package com.android.settings.biometrics.fingerprint; 


import android.app.Activity;

import android.app.KeyguardManager;

import android.app.admin.DevicePolicyManager;

import android.app.settings.SettingsEnums;

import android.content.Intent;

import android.hardware.fingerprint.FingerprintManager;

import android.os.Bundle;

import android.os.UserHandle;

import android.os.storage.StorageManager;

import android.view.View;

import android.widget.TextView;



import com.android.internal.widget.LockPatternUtils;

import com.android.settings.R;

import com.android.settings.SetupWizardUtils;

import com.android.settings.Utils;

import com.android.settings.biometrics.BiometricUtils;

import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;

import com.android.settings.password.ChooseLockSettingsHelper;

import com.android.settings.password.SetupChooseLockGeneric;

import com.android.settings.password.SetupSkipDialog;
@@ -86,8 +82,7 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu 
    protected void initViews() {

        super.initViews();



        TextView description = (TextView) findViewById(R.id.sud_layout_description);

        description.setText(

        setDescriptionText(

                R.string.security_settings_fingerprint_enroll_introduction_message_setup);



        FooterButton nextButton = getNextButton();