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

Commit cff0acb6 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Wait for Keyguard to be drawn after boot. 

The old logic with waiting for the Keyguard to be drawn assumed that
it is in an own window, and just checked for the visibility. This is
no longer possible as the Keyguard is in the status bar, and the status
bar might have been drawn without the Keyguard. So we have to wait
explicitely until Keyguard told PhoneWindowManager that it has now been
drawn and we can turn on the screen.

In addition, the starting logic of SystemUI is moved into
SystemUIApplication such the we can make sure that the status bar
already exists when the callbacks from PhoneWindowManager reach
KeyguardService. This simplifies the logic a lot.

Bug: 13635952
Change-Id: Ifd6ba795647edcf3501641e39052e4d04bc826fb
parent 8533b95b

core/java/android/view/IWindowManager.aidl

+5 −0
Original line number Diff line number Diff line
@@ -233,4 +233,9 @@ interface IWindowManager 
     * Device is in safe mode.

     */

    boolean isSafeModeEnabled();



    /**

     * Enables the screen if all conditions are met.

     */

    void enableScreenIfNeeded();

}

core/java/android/view/WindowManagerPolicy.java

+8 −0
Original line number Diff line number Diff line
@@ -1006,6 +1006,14 @@ public interface WindowManagerPolicy { 
     */

    public void dismissKeyguardLw();



    /**

     * Ask the policy whether the Keyguard has drawn. If the Keyguard is disabled, this method

     * returns true as soon as we know that Keyguard is disabled.

     *

     * @return true if the keyguard has drawn.

     */

    public boolean isKeyguardDrawnLw();



    /**

     * Given an orientation constant, returns the appropriate surface rotation,

     * taking into account sensors, docking mode, rotation lock, and other factors.

packages/SystemUI/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 
    <uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />



    <application

        android:name=".SystemUIApplication"

        android:persistent="true"

        android:allowClearUserData="false"

        android:allowBackup="false"

packages/SystemUI/src/com/android/systemui/SystemUIApplication.java

0 → 100644
+89 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License

 */



package com.android.systemui;



import android.app.Application;

import android.content.res.Configuration;

import android.util.Log;



import java.util.HashMap;

import java.util.Map;



/**

 * Application class for SystemUI.

 */

public class SystemUIApplication extends Application {



    private static final String TAG = "SystemUIService";

    private static final boolean DEBUG = false;



    /**

     * The classes of the stuff to start.

     */

    private final Class<?>[] SERVICES = new Class[] {

            com.android.systemui.keyguard.KeyguardViewMediator.class,

            com.android.systemui.recent.Recents.class,

            com.android.systemui.statusbar.SystemBars.class,

            com.android.systemui.usb.StorageNotification.class,

            com.android.systemui.power.PowerUI.class,

            com.android.systemui.media.RingtonePlayer.class,

            com.android.systemui.settings.SettingsUI.class,

    };



    /**

     * Hold a reference on the stuff we start.

     */

    private final SystemUI[] mServices = new SystemUI[SERVICES.length];

    private final Map<Class<?>, Object> mComponents = new HashMap<Class<?>, Object>();



    @Override

    public void onCreate() {

        final int N = SERVICES.length;

        for (int i=0; i<N; i++) {

            Class<?> cl = SERVICES[i];

            if (DEBUG) Log.d(TAG, "loading: " + cl);

            try {

                mServices[i] = (SystemUI)cl.newInstance();

            } catch (IllegalAccessException ex) {

                throw new RuntimeException(ex);

            } catch (InstantiationException ex) {

                throw new RuntimeException(ex);

            }

            mServices[i].mContext = this;

            mServices[i].mComponents = mComponents;

            if (DEBUG) Log.d(TAG, "running: " + mServices[i]);

            mServices[i].start();

        }

    }



    @Override

    public void onConfigurationChanged(Configuration newConfig) {

        int len = mServices.length;

        for (int i = 0; i < len; i++) {

            mServices[i].onConfigurationChanged(newConfig);

        }

    }



    @SuppressWarnings("unchecked")

    public <T> T getComponent(Class<T> interfaceType) {

        return (T) mComponents.get(interfaceType);

    }



    public SystemUI[] getServices() {

        return mServices;

    }

}

packages/SystemUI/src/com/android/systemui/SystemUIService.java

+3 −54
Original line number Diff line number Diff line
@@ -18,65 +18,13 @@ package com.android.systemui; 


import android.app.Service;

import android.content.Intent;

import android.content.res.Configuration;

import android.os.IBinder;

import android.util.Log;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.HashMap;



public class SystemUIService extends Service {

    private static final String TAG = "SystemUIService";



    /**

     * The classes of the stuff to start.

     */

    private final Class<?>[] SERVICES = new Class[] {

            com.android.systemui.recent.Recents.class,

            com.android.systemui.statusbar.SystemBars.class,

            com.android.systemui.usb.StorageNotification.class,

            com.android.systemui.power.PowerUI.class,

            com.android.systemui.media.RingtonePlayer.class,

            com.android.systemui.settings.SettingsUI.class,

        };



    /**

     * Hold a reference on the stuff we start.

     */

    private final SystemUI[] mServices = new SystemUI[SERVICES.length];



    @Override

    public void onCreate() {

        HashMap<Class<?>, Object> components = new HashMap<Class<?>, Object>();

        final int N = SERVICES.length;

        for (int i=0; i<N; i++) {

            Class<?> cl = SERVICES[i];

            Log.d(TAG, "loading: " + cl);

            try {

                mServices[i] = (SystemUI)cl.newInstance();

            } catch (IllegalAccessException ex) {

                throw new RuntimeException(ex);

            } catch (InstantiationException ex) {

                throw new RuntimeException(ex);

            }

            mServices[i].mContext = this;

            mServices[i].mComponents = components;

            Log.d(TAG, "running: " + mServices[i]);

            mServices[i].start();

        }

    }



    @Override

    public void onConfigurationChanged(Configuration newConfig) {

        for (SystemUI ui: mServices) {

            ui.onConfigurationChanged(newConfig);

        }

    }



    /**

     * Nobody binds to us.

     */

    @Override

    public IBinder onBind(Intent intent) {

        return null;
@@ -84,14 +32,15 @@ public class SystemUIService extends Service { 


    @Override

    protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        SystemUI[] services = ((SystemUIApplication) getApplication()).getServices();

        if (args == null || args.length == 0) {

            for (SystemUI ui: mServices) {

            for (SystemUI ui: services) {

                pw.println("dumping service: " + ui.getClass().getName());

                ui.dump(fd, pw, args);

            }

        } else {

            String svc = args[0];

            for (SystemUI ui: mServices) {

            for (SystemUI ui: services) {

                String name = ui.getClass().getName();

                if (name.endsWith(svc)) {

                    ui.dump(fd, pw, args);