am 4e792fa5: Merge "Polish animations for fingerprint icon" into mnc-dev

* commit '4e792fa5a9b8de20503011dcffce92f96435d53c':
  Polish animations for fingerprint icon
  MediaPlayer: add mPreparing to weed out unwanted prepared messages
  BatteryStatsService: Only query bluetooth on demand.
  Indicate failed scans with EXTRA_RESULTS_UPDATED
  BatteryStatsService: Only query bluetooth on demand.
  Indicate failed scans with EXTRA_RESULTS_UPDATED
  For getHomeActivity() only return current user.
  Fix application moves.
  Close race condition in binderDied()
  Write packages.list when adding/removing users.
  camera: Add AIDL interface for CameraServiceProxy.
  Fix NPE in setSurfaceTexure
  Deal more gracefully with null smallIcons.
  Don't crash in bugreport on devices without BT
  Push initial disk state, handle empty media.

1 files changed, 1 insertions, 1 deletions

diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 5360645..3c30d8c 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -659,6 +659,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
     }
 
     protected void handleScreenTurnedOn() {
+        updateFingerprintListeningState();
         final int count = mCallbacks.size();
         for (int i = 0; i < count; i++) {
             KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
@@ -666,7 +667,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
                 cb.onScreenTurnedOn();
             }
         }
-        updateFingerprintListeningState();
     }
 
     protected void handleScreenTurnedOff(int arg1) {