diff options
| author | Craig Mautner <cmautner@google.com> | 2014-09-13 22:45:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-13 22:45:28 +0000 |
| commit | a3804a0aab5c655dd87211fd332c26b74d11e2d7 (patch) | |
| tree | c13bfdc70a97caa0b485743fb212401ce97841cf /policy/src | |
| parent | 2047df6f5f6af14cdb93f220c0329f1bff7a43ff (diff) | |
| parent | c3daeddae4df4c0115bc78858d0e7cdea9ff96ee (diff) | |
| download | frameworks_base-a3804a0aab5c655dd87211fd332c26b74d11e2d7.zip frameworks_base-a3804a0aab5c655dd87211fd332c26b74d11e2d7.tar.gz frameworks_base-a3804a0aab5c655dd87211fd332c26b74d11e2d7.tar.bz2 | |
Merge "Give a tablet a chance." into lmp-dev
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 24e5a7d..02adef4 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -46,11 +46,7 @@ import android.media.AudioManager; import android.media.IAudioService; import android.media.Ringtone; import android.media.RingtoneManager; -import android.media.session.MediaController; -import android.media.session.MediaSession; import android.media.session.MediaSessionLegacyHelper; -import android.media.session.MediaSessionManager; -import android.media.session.PlaybackState; import android.os.Bundle; import android.os.FactoryTest; import android.os.Handler; @@ -101,7 +97,6 @@ import android.view.WindowManagerInternal; import android.view.WindowManagerPolicy; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; -import android.view.animation.AlphaAnimation; import android.view.animation.Animation; import android.view.animation.AnimationSet; import android.view.animation.AnimationUtils; @@ -120,9 +115,7 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; import java.io.PrintWriter; -import java.util.ArrayList; import java.util.HashSet; -import java.util.List; import static android.view.WindowManager.LayoutParams.*; import static android.view.WindowManagerPolicy.WindowManagerFuncs.LID_ABSENT; @@ -231,6 +224,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { KeyEvent.KEYCODE_CALCULATOR, Intent.CATEGORY_APP_CALCULATOR); } + /** Amount of time (in milliseconds) to wait for windows drawn before powering on. */ + static final int WAITING_FOR_DRAWN_TIMEOUT = 1000; + /** * Lock protecting internal state. Must not call out into window * manager with lock held. (This lock will be acquired in places @@ -4778,7 +4774,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (DEBUG_WAKEUP) Slog.d(TAG, "null mKeyguardDelegate: setting mKeyguardDrawComplete."); mKeyguardDrawComplete = true; } - mWindowManagerInternal.waitForAllWindowsDrawn(mWindowManagerDrawCallback, 500); + mWindowManagerInternal.waitForAllWindowsDrawn(mWindowManagerDrawCallback, + WAITING_FOR_DRAWN_TIMEOUT); } // Called on the mHandler thread. |