commit 0ce0e85976ad4e1352ac3ec1adab42f8097ce8bf
author Christine Chen <christinech@google.com> Fri Aug 09 18:26:31 2013 -0700
committer Christine Chen <christinech@google.com> Fri Sep 06 12:14:47 2013 -0700
tree b635ec20bf6a0ffc93182601c1f8d325d2a1a88a
parent 4527702619ef22da25dae00173675a4468a1314c

Adds package picker for sending text messages.

Bug: 10608694
Change-Id: I645f00135615d29b78e72b80584fea0410d7da8d

src/com/android/phone/PhoneGlobals.java

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index dc7d64b..db06c30 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -1034,16 +1034,12 @@
         //
         boolean isRinging = (state == PhoneConstants.State.RINGING);
         boolean isDialing = (phone.getForegroundCall().getState() == Call.State.DIALING);
-        boolean showingQuickResponseDialog = (mInCallScreen != null) &&
-                mInCallScreen.isQuickResponseDialogShowing();
         boolean showingDisconnectedConnection =
                 PhoneUtils.hasDisconnectedConnections(phone) && isShowingCallScreen;
-        boolean keepScreenOn = isRinging || isDialing ||
-                (showingDisconnectedConnection && !showingQuickResponseDialog);
+        boolean keepScreenOn = isRinging || isDialing || showingDisconnectedConnection;
         if (DBG) Log.d(LOG_TAG, "updateWakeState: keepScreenOn = " + keepScreenOn
                        + " (isRinging " + isRinging
                        + ", isDialing " + isDialing
-                       + ", showingQuickResponse " + showingQuickResponseDialog
                        + ", showingDisc " + showingDisconnectedConnection + ")");
         // keepScreenOn == true means we'll hold a full wake lock:
         requestWakeState(keepScreenOn ? WakeState.FULL : WakeState.SLEEP);