summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/fingerprint
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-06-25 17:18:12 -0700
committerJim Miller <jaggies@google.com>2015-06-26 14:00:15 -0700
commit8dc38d96ba7070b63d1ba71f2cde2136be493952 (patch)
treeac8c20e78f98d555301fd0f7b0471809bcade8e4 /src/com/android/settings/fingerprint
parent614fc178bf028ef66bea24a70ae476a91833a7f1 (diff)
downloadpackages_apps_Settings-8dc38d96ba7070b63d1ba71f2cde2136be493952.zip
packages_apps_Settings-8dc38d96ba7070b63d1ba71f2cde2136be493952.tar.gz
packages_apps_Settings-8dc38d96ba7070b63d1ba71f2cde2136be493952.tar.bz2
Remove userActivity() from Settings now that it's managed by FingerprintService
Fixes bug 20732273 Change-Id: Ia6ad603cab0255d3ee8739c36516597594acd1f2
Diffstat (limited to 'src/com/android/settings/fingerprint')
-rw-r--r--src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
index fa65afe..6a47dc4 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
@@ -23,8 +23,6 @@ import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
import android.os.CancellationSignal;
import android.os.Handler;
-import android.os.PowerManager;
-import android.os.SystemClock;
import com.android.settings.ChooseLockSettingsHelper;
@@ -36,7 +34,6 @@ public class FingerprintEnrollSidecar extends Fragment {
private int mEnrollmentSteps = -1;
private int mEnrollmentRemaining = 0;
private Listener mListener;
- private PowerManager mPowerManager;
private boolean mEnrolling;
private CancellationSignal mEnrollmentCancel;
private Handler mHandler = new Handler();
@@ -52,7 +49,6 @@ public class FingerprintEnrollSidecar extends Fragment {
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
- mPowerManager = activity.getSystemService(PowerManager.class);
mToken = activity.getIntent().getByteArrayExtra(
ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
}
@@ -120,11 +116,6 @@ public class FingerprintEnrollSidecar extends Fragment {
if (mListener != null) {
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