PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8dc38d96: Remove userActivity() from Settings now that it\'s managed by FingerprintService

Browse Source 
* commit '8dc38d96ba7070b63d1ba71f2cde2136be493952':
  Remove userActivity() from Settings now that it's managed by FingerprintService
This commit is contained in:
Jim Miller
2015-06-26 21:12:13 +00:00
committed by Android Git Automerger
parent 996e8b1fe2 8dc38d96ba
commit 2f16e67019
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
View File

@@ -23,8 +23,6 @@ import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.CancellationSignal; import android.os.CancellationSignal;
import android.os.Handler; import android.os.Handler;
import android.os.PowerManager;
import android.os.SystemClock;
import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.ChooseLockSettingsHelper;
@@ -36,7 +34,6 @@ public class FingerprintEnrollSidecar extends Fragment {
private int mEnrollmentSteps = -1; private int mEnrollmentSteps = -1;
private int mEnrollmentRemaining = 0; private int mEnrollmentRemaining = 0;
private Listener mListener; private Listener mListener;
private PowerManager mPowerManager;
private boolean mEnrolling; private boolean mEnrolling;
private CancellationSignal mEnrollmentCancel; private CancellationSignal mEnrollmentCancel;
private Handler mHandler = new Handler(); private Handler mHandler = new Handler();
@@ -52,7 +49,6 @@ public class FingerprintEnrollSidecar extends Fragment {
@Override @Override
public void onAttach(Activity activity) { public void onAttach(Activity activity) {
super.onAttach(activity); super.onAttach(activity);
mPowerManager = activity.getSystemService(PowerManager.class);
mToken = activity.getIntent().getByteArrayExtra( mToken = activity.getIntent().getByteArrayExtra(
ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN); ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
} }
@@ -120,11 +116,6 @@ public class FingerprintEnrollSidecar extends Fragment {
if (mListener != null) { if (mListener != null) {
mListener.onEnrollmentProgressChange(mEnrollmentSteps, remaining); mListener.onEnrollmentProgressChange(mEnrollmentSteps, remaining);
} }
// Treat fingerprint like a touch event
mPowerManager.userActivity(SystemClock.uptimeMillis(),
PowerManager.USER_ACTIVITY_EVENT_OTHER,
PowerManager.USER_ACTIVITY_FLAG_NO_CHANGE_LIGHTS);
} }
@Override @Override