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

cbb9298b · Mohamad Ayyash · Android (Google) Code Review · f17dec63 · b9597d03 · cbb9298b
Commit cbb9298b authored 10 years ago by Mohamad Ayyash Committed by Android (Google) Code Review 10 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

src/java/com/android/internal/telephony/RIL.java src/java/com/android/internal/telephony/RIL.java +3 -5

No files found.
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -2216,8 +2216,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
            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 @@ public final class RIL extends BaseCommands implements CommandsInterface {
    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) {