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

Commit dc5f16bf authored by Dan Sandler's avatar Dan Sandler
Browse files

Avoid sending broadcasts before BOOT_COMPLETED. 

SystemUI instances can now take advantage of a new lifecycle
callback, onBootCompleted(), to avoid jumping the gun.

Bug: 14092537
Change-Id: I3f7db7a4753f874c4d75235f263c2bd374debec4
parent 06661993

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,9 @@ public abstract class SystemUI { 
    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

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

    }

    }





    protected void onBootCompleted() {

    }



    @SuppressWarnings("unchecked")

    @SuppressWarnings("unchecked")

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

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

        return (T) (mComponents != null ? mComponents.get(interfaceType) : null);

        return (T) (mComponents != null ? mComponents.get(interfaceType) : null);

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

+38 −0
Original line number Original line Diff line number Diff line
@@ -17,7 +17,12 @@ 
package com.android.systemui;

package com.android.systemui;





import android.app.Application;

import android.app.Application;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.res.Configuration;

import android.content.res.Configuration;

import android.os.SystemProperties;

import android.util.Log;

import android.util.Log;





import java.util.HashMap;

import java.util.HashMap;
@@ -49,6 +54,7 @@ public class SystemUIApplication extends Application { 
     */

     */

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

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

    private boolean mServicesStarted;

    private boolean mServicesStarted;

    private boolean mBootCompleted;

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

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





    @Override

    @Override
@@ -58,6 +64,23 @@ public class SystemUIApplication extends Application { 
        // application theme in the manifest does only work for activities. Keep this in sync with

        // application theme in the manifest does only work for activities. Keep this in sync with

        // the theme set there.

        // the theme set there.

        setTheme(R.style.systemui_theme);

        setTheme(R.style.systemui_theme);



        registerReceiver(new BroadcastReceiver() {

            @Override

            public void onReceive(Context context, Intent intent) {

                if (mBootCompleted) return;



                if (DEBUG) Log.v(TAG, "BOOT_COMPLETED received");

                unregisterReceiver(this);

                mBootCompleted = true;

                if (mServicesStarted) {

                    final int N = mServices.length;

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

                        mServices[i].onBootCompleted();

                    }

                }

            }

        }, new IntentFilter(Intent.ACTION_BOOT_COMPLETED));

    }

    }





    /**

    /**
@@ -71,6 +94,17 @@ public class SystemUIApplication extends Application { 
        if (mServicesStarted) {

        if (mServicesStarted) {

            return;

            return;

        }

        }



        if (!mBootCompleted) {

            // check to see if maybe it was already completed long before we began

            // see ActivityManagerService.finishBooting()

            if ("1".equals(SystemProperties.get("sys.boot_completed"))) {

                mBootCompleted = true;

                if (DEBUG) Log.v(TAG, "BOOT_COMPLETED was already sent");

            }

        }



        Log.v(TAG, "Starting SystemUI services.");

        final int N = SERVICES.length;

        final int N = SERVICES.length;

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

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

            Class<?> cl = SERVICES[i];

            Class<?> cl = SERVICES[i];
@@ -86,6 +120,10 @@ public class SystemUIApplication extends Application { 
            mServices[i].mComponents = mComponents;

            mServices[i].mComponents = mComponents;

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

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

            mServices[i].start();

            mServices[i].start();



            if (mBootCompleted) {

                mServices[i].onBootCompleted();

            }

        }

        }

        mServicesStarted = true;

        mServicesStarted = true;

    }

    }

packages/SystemUI/src/com/android/systemui/recent/Recents.java

+28 −7
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import android.graphics.Canvas; 
import android.graphics.Paint;

import android.graphics.Paint;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.os.Bundle;

import android.os.SystemProperties;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserHandle;

import android.util.DisplayMetrics;

import android.util.DisplayMetrics;
@@ -45,6 +46,7 @@ public class Recents extends SystemUI implements RecentsComponent { 
    // Which recents to use

    // Which recents to use

    boolean mUseAlternateRecents;

    boolean mUseAlternateRecents;

    AlternateRecentsComponent mAlternateRecents;

    AlternateRecentsComponent mAlternateRecents;

    boolean mBootCompleted = false;





    @Override

    @Override

    public void start() {

    public void start() {
@@ -59,6 +61,11 @@ public class Recents extends SystemUI implements RecentsComponent { 
        putComponent(RecentsComponent.class, this);

        putComponent(RecentsComponent.class, this);

    }

    }





    @Override

    protected void onBootCompleted() {

        mBootCompleted = true;

    }



    @Override

    @Override

    public void toggleRecents(Display display, int layoutDirection, View statusBarView) {

    public void toggleRecents(Display display, int layoutDirection, View statusBarView) {

        if (mUseAlternateRecents) {

        if (mUseAlternateRecents) {
@@ -197,13 +204,11 @@ public class Recents extends SystemUI implements RecentsComponent { 
                                Intent intent =

                                Intent intent =

                                        new Intent(RecentsActivity.WINDOW_ANIMATION_START_INTENT);

                                        new Intent(RecentsActivity.WINDOW_ANIMATION_START_INTENT);

                                intent.setPackage("com.android.systemui");

                                intent.setPackage("com.android.systemui");

                                mContext.sendBroadcastAsUser(intent,

                                sendBroadcastSafely(intent);

                                        new UserHandle(UserHandle.USER_CURRENT));

                            }

                            }

                        });

                        });

                intent.putExtra(RecentsActivity.WAITING_FOR_WINDOW_ANIMATION_PARAM, true);

                intent.putExtra(RecentsActivity.WAITING_FOR_WINDOW_ANIMATION_PARAM, true);

                mContext.startActivityAsUser(intent, opts.toBundle(), new UserHandle(

                startActivitySafely(intent, opts.toBundle());

                        UserHandle.USER_CURRENT));

            }

            }

        } catch (ActivityNotFoundException e) {

        } catch (ActivityNotFoundException e) {

            Log.e(TAG, "Failed to launch RecentAppsIntent", e);

            Log.e(TAG, "Failed to launch RecentAppsIntent", e);
@@ -225,7 +230,7 @@ public class Recents extends SystemUI implements RecentsComponent { 
            Intent intent = new Intent(RecentsActivity.PRELOAD_INTENT);

            Intent intent = new Intent(RecentsActivity.PRELOAD_INTENT);

            intent.setClassName("com.android.systemui",

            intent.setClassName("com.android.systemui",

                    "com.android.systemui.recent.RecentsPreloadReceiver");

                    "com.android.systemui.recent.RecentsPreloadReceiver");

            mContext.sendBroadcastAsUser(intent, new UserHandle(UserHandle.USER_CURRENT));

            sendBroadcastSafely(intent);





            RecentTasksLoader.getInstance(mContext).preloadFirstTask();

            RecentTasksLoader.getInstance(mContext).preloadFirstTask();

        }

        }
@@ -239,7 +244,7 @@ public class Recents extends SystemUI implements RecentsComponent { 
            Intent intent = new Intent(RecentsActivity.CANCEL_PRELOAD_INTENT);

            Intent intent = new Intent(RecentsActivity.CANCEL_PRELOAD_INTENT);

            intent.setClassName("com.android.systemui",

            intent.setClassName("com.android.systemui",

                    "com.android.systemui.recent.RecentsPreloadReceiver");

                    "com.android.systemui.recent.RecentsPreloadReceiver");

            mContext.sendBroadcastAsUser(intent, new UserHandle(UserHandle.USER_CURRENT));

            sendBroadcastSafely(intent);





            RecentTasksLoader.getInstance(mContext).cancelPreloadingFirstTask();

            RecentTasksLoader.getInstance(mContext).cancelPreloadingFirstTask();

        }

        }
@@ -252,9 +257,25 @@ public class Recents extends SystemUI implements RecentsComponent { 
        } else {

        } else {

            Intent intent = new Intent(RecentsActivity.CLOSE_RECENTS_INTENT);

            Intent intent = new Intent(RecentsActivity.CLOSE_RECENTS_INTENT);

            intent.setPackage("com.android.systemui");

            intent.setPackage("com.android.systemui");

            mContext.sendBroadcastAsUser(intent, new UserHandle(UserHandle.USER_CURRENT));

            sendBroadcastSafely(intent);





            RecentTasksLoader.getInstance(mContext).cancelPreloadingFirstTask();

            RecentTasksLoader.getInstance(mContext).cancelPreloadingFirstTask();

        }

        }

    }

    }



    /**

     * Send broadcast only if BOOT_COMPLETED

     */

    private void sendBroadcastSafely(Intent intent) {

        if (!mBootCompleted) return;

        mContext.sendBroadcastAsUser(intent, new UserHandle(UserHandle.USER_CURRENT));

    }



    /**

     * Start activity only if BOOT_COMPLETED

     */

    private void startActivitySafely(Intent intent, Bundle opts) {

        if (!mBootCompleted) return;

        mContext.startActivityAsUser(intent, opts, new UserHandle(UserHandle.USER_CURRENT));

    }

}
 
}