commit 18ae8512b9357907f0411013aec46209aa40a384
author Adam Lesinski <adamlesinski@google.com> Sat Jun 27 01:10:47 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 27 01:10:51 2015 +0000
tree d96cadac796eff21604191703e7697550121d7a7
parent 8ac57a16cd42851e535f3914c8f5a7a516982f5c
parent cba028c60ae8b0666245d35c7bf8c4eb510a7d5f

Merge "Report real wifi running time in Power Details" into mnc-dev

src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java

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.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 @@
     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 @@
     @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 @@
             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

src/com/android/settings/wifi/WifiConfigController.java

diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 1742c16..bc5f308 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -254,14 +254,14 @@
                     mConfigUi.setSubmitButton(res.getString(R.string.wifi_connect));
                 } else {
                     if (state != null) {
+                        boolean isEphemeral = mAccessPoint.isEphemeral();
                         WifiConfiguration config = mAccessPoint.getConfig();
-                        boolean isEphimeral = mAccessPoint.isSaved() == false;
                         String providerFriendlyName = null;
                         if (config != null && config.isPasspoint()) {
                             providerFriendlyName = config.providerFriendlyName;
                         }
                         String summary = AccessPoint.getSummary(
-                                mConfigUi.getContext(), state, isEphimeral, providerFriendlyName);
+                                mConfigUi.getContext(), state, isEphemeral, providerFriendlyName);
                         addRow(group, R.string.wifi_status, summary);
                     }