commit 2865ee97881486cc533e0336b9865ca5a6ee0a2a
author Mohamad Ayyash <mkayyash@google.com> Thu Oct 16 23:08:01 2014 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 16 23:08:01 2014 +0000
tree 9515bc96537fbbae899905ea4010da647845f9f2
parent e0e741bfdeaee35109a47b5ff0de14c5f50483b6
parent cbb9298b084b89d794eca0aae4e6997076e68284

Merge "ril: Fix update screen events." into lmp-dev
automerge: cbb9298

* commit 'cbb9298b084b89d794eca0aae4e6997076e68284':
  ril: Fix update screen events.

src/java/com/android/internal/telephony/RIL.java

diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index 0789b66..f59e883 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -2216,8 +2216,8 @@
             if (oldState != Display.STATE_ON
                     && mDefaultDisplayState == Display.STATE_ON) {
                 sendScreenState(true);
-            } else if (oldState == Display.STATE_ON
-                    && mDefaultDisplayState != Display.STATE_ON) {
+            } else if ((oldState == Display.STATE_ON || oldState == Display.STATE_UNKNOWN)
+                        && mDefaultDisplayState != Display.STATE_ON) {
                 sendScreenState(false);
             }
         }
@@ -2239,9 +2239,7 @@
     onRadioAvailable() {
         // In case screen state was lost (due to process crash),
         // this ensures that the RIL knows the correct screen state.
-
-        PowerManager pm = (PowerManager)mContext.getSystemService(Context.POWER_SERVICE);
-        sendScreenState(pm.isScreenOn());
+        updateScreenState();
    }
 
     private RadioState getRadioStateFromInt(int stateInt) {