Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3daedda authored by Craig Mautner's avatar Craig Mautner
Browse files

Give a tablet a chance. 

500 msec is apparently not enough time to push the pixels around on
a Volantis (or Manta, or occasionally Deb). Increasing the timeout
eliminates turning the screen on before the surface is completely
drawn.

Optimizing the drawing path so that we can return the timeout to
500ms has been filed as b/17496306.

Fixes bug 16849724.

Change-Id: Ic0fca68bc41caa67dba973b5c40915756dc4730f
parent df980618

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+5 −8
Original line number Diff line number Diff line
@@ -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
@@ -4768,7 +4764,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.