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

Commit 22808eef authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 280e50f1: am 3f0d9580: am f6138f07: Merge "Don\'t consider the boot... 

am 280e50f1: am 3f0d9580: am f6138f07: Merge "Don\'t consider the boot completed until the animation is over." into jb-mr1-dev

* commit '280e50f1':
  Don't consider the boot completed until the animation is over.
parents 86e0935a 280e50f1

services/java/com/android/server/power/PowerManagerService.java

+42 −3
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ import android.os.PowerManager; 
import android.os.Process;

import android.os.Process;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.SystemClock;

import android.os.SystemService;

import android.os.UserHandle;

import android.os.UserHandle;

import android.os.WorkSource;

import android.os.WorkSource;

import android.provider.Settings;

import android.provider.Settings;
@@ -81,6 +82,8 @@ public final class PowerManagerService extends IPowerManager.Stub 
    private static final int MSG_SANDMAN = 2;

    private static final int MSG_SANDMAN = 2;

    // Message: Sent when the screen on blocker is released.

    // Message: Sent when the screen on blocker is released.

    private static final int MSG_SCREEN_ON_BLOCKER_RELEASED = 3;

    private static final int MSG_SCREEN_ON_BLOCKER_RELEASED = 3;

    // Message: Sent to poll whether the boot animation has terminated.

    private static final int MSG_CHECK_IF_BOOT_ANIMATION_FINISHED = 4;





    // Dirty bit: mWakeLocks changed

    // Dirty bit: mWakeLocks changed

    private static final int DIRTY_WAKE_LOCKS = 1 << 0;

    private static final int DIRTY_WAKE_LOCKS = 1 << 0;
@@ -153,6 +156,12 @@ public final class PowerManagerService extends IPowerManager.Stub 
    // See point of use for more details.

    // See point of use for more details.

    private static final int WIRELESS_CHARGER_TURN_ON_BATTERY_LEVEL_LIMIT = 95;

    private static final int WIRELESS_CHARGER_TURN_ON_BATTERY_LEVEL_LIMIT = 95;





    // The name of the boot animation service in init.rc.

    private static final String BOOT_ANIMATION_SERVICE = "bootanim";



    // Poll interval in milliseconds for watching boot animation finished.

    private static final int BOOT_ANIMATION_POLL_INTERVAL = 200;



    private Context mContext;

    private Context mContext;

    private LightsService mLightsService;

    private LightsService mLightsService;

    private BatteryService mBatteryService;

    private BatteryService mBatteryService;
@@ -1662,6 +1671,29 @@ public final class PowerManagerService extends IPowerManager.Stub 
        updatePowerStateLocked();

        updatePowerStateLocked();

    }

    }





    private void startWatchingForBootAnimationFinished() {

        mHandler.sendEmptyMessage(MSG_CHECK_IF_BOOT_ANIMATION_FINISHED);

    }



    private void checkIfBootAnimationFinished() {

        if (DEBUG) {

            Slog.d(TAG, "Check if boot animation finished...");

        }



        if (SystemService.isRunning(BOOT_ANIMATION_SERVICE)) {

            mHandler.sendEmptyMessageDelayed(MSG_CHECK_IF_BOOT_ANIMATION_FINISHED,

                    BOOT_ANIMATION_POLL_INTERVAL);

            return;

        }



        synchronized (mLock) {

            if (!mBootCompleted) {

                Slog.i(TAG, "Boot animation finished.");

                handleBootCompletedLocked();

            }

        }

    }



    private void handleBootCompletedLocked() {

    private void handleBootCompletedLocked() {

        final long now = SystemClock.uptimeMillis();

        final long now = SystemClock.uptimeMillis();

        mBootCompleted = true;

        mBootCompleted = true;
@@ -2170,9 +2202,13 @@ public final class PowerManagerService extends IPowerManager.Stub 
    private final class BootCompletedReceiver extends BroadcastReceiver {

    private final class BootCompletedReceiver extends BroadcastReceiver {

        @Override

        @Override

        public void onReceive(Context context, Intent intent) {

        public void onReceive(Context context, Intent intent) {

            synchronized (mLock) {

            // This is our early signal that the system thinks it has finished booting.

                handleBootCompletedLocked();

            // However, the boot animation may still be running for a few more seconds

            }

            // since it is ultimately in charge of when it terminates.

            // Defer transitioning into the boot completed state until the animation exits.

            // We do this so that the screen does not start to dim prematurely before

            // the user has actually had a chance to interact with the device.

            startWatchingForBootAnimationFinished();

        }

        }

    }

    }
@@ -2227,6 +2263,9 @@ public final class PowerManagerService extends IPowerManager.Stub 
                case MSG_SCREEN_ON_BLOCKER_RELEASED:

                case MSG_SCREEN_ON_BLOCKER_RELEASED:

                    handleScreenOnBlockerReleased();

                    handleScreenOnBlockerReleased();

                    break;

                    break;

                case MSG_CHECK_IF_BOOT_ANIMATION_FINISHED:

                    checkIfBootAnimationFinished();

                    break;

            }

            }

        }

        }

    }

    }