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

Commit 93be005f authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Bump up priority of system receiving BOOT_COMPLETED."

parents 94814218 d83a096f

core/res/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -2793,7 +2793,7 @@ 




        <receiver android:name="com.android.server.BootReceiver"

        <receiver android:name="com.android.server.BootReceiver"

                android:primaryUserOnly="true">

                android:primaryUserOnly="true">

            <intent-filter>

            <intent-filter android:priority="1000">

                <action android:name="android.intent.action.BOOT_COMPLETED" />

                <action android:name="android.intent.action.BOOT_COMPLETED" />

            </intent-filter>

            </intent-filter>

        </receiver>

        </receiver>

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -138,7 +138,7 @@ 
                android:exported="true" />

                android:exported="true" />





        <receiver android:name=".BootReceiver" androidprv:primaryUserOnly="true">

        <receiver android:name=".BootReceiver" androidprv:primaryUserOnly="true">

            <intent-filter>

            <intent-filter android:priority="1000">

                <action android:name="android.intent.action.BOOT_COMPLETED" />

                <action android:name="android.intent.action.BOOT_COMPLETED" />

            </intent-filter>

            </intent-filter>

        </receiver>

        </receiver>

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -65,6 +65,8 @@ public class SystemUIApplication extends Application { 
        // the theme set there.

        // the theme set there.

        setTheme(R.style.systemui_theme);

        setTheme(R.style.systemui_theme);





        IntentFilter filter = new IntentFilter(Intent.ACTION_BOOT_COMPLETED);

        filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);

        registerReceiver(new BroadcastReceiver() {

        registerReceiver(new BroadcastReceiver() {

            @Override

            @Override

            public void onReceive(Context context, Intent intent) {

            public void onReceive(Context context, Intent intent) {
@@ -80,7 +82,7 @@ public class SystemUIApplication extends Application { 
                    }

                    }

                }

                }

            }

            }

        }, new IntentFilter(Intent.ACTION_BOOT_COMPLETED));

        }, filter);

    }

    }





    /**

    /**

services/appwidget/java/com/android/server/appwidget/AppWidgetService.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -125,8 +125,10 @@ public class AppWidgetService extends SystemService implements WidgetBackupProvi 
            // Register for the boot completed broadcast, so we can send the

            // Register for the boot completed broadcast, so we can send the

            // ENABLE broacasts. If we try to send them now, they time out,

            // ENABLE broacasts. If we try to send them now, they time out,

            // because the system isn't ready to handle them yet.

            // because the system isn't ready to handle them yet.

            IntentFilter filter = new IntentFilter(Intent.ACTION_BOOT_COMPLETED);

            filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);

            mContext.registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL,

            mContext.registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL,

                    new IntentFilter(Intent.ACTION_BOOT_COMPLETED), null, null);

                    filter, null, null);





            // Register for configuration changes so we can update the names

            // Register for configuration changes so we can update the names

            // of the widgets when the locale changes.

            // of the widgets when the locale changes.
@@ -135,7 +137,6 @@ public class AppWidgetService extends SystemService implements WidgetBackupProvi 




            // Register for broadcasts about package install, etc., so we can

            // Register for broadcasts about package install, etc., so we can

            // update the provider list.

            // update the provider list.

            IntentFilter filter = new IntentFilter();

            filter.addAction(Intent.ACTION_PACKAGE_ADDED);

            filter.addAction(Intent.ACTION_PACKAGE_ADDED);

            filter.addAction(Intent.ACTION_PACKAGE_CHANGED);

            filter.addAction(Intent.ACTION_PACKAGE_CHANGED);

            filter.addAction(Intent.ACTION_PACKAGE_REMOVED);

            filter.addAction(Intent.ACTION_PACKAGE_REMOVED);

services/core/java/com/android/server/BluetoothManagerService.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -212,6 +212,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        filter.addAction(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);

        filter.addAction(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);

        filter.addAction(Intent.ACTION_USER_SWITCHED);

        filter.addAction(Intent.ACTION_USER_SWITCHED);

        registerForAirplaneMode(filter);

        registerForAirplaneMode(filter);

        filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);

        mContext.registerReceiver(mReceiver, filter);

        mContext.registerReceiver(mReceiver, filter);

        loadStoredNameAndAddress();

        loadStoredNameAndAddress();

        if (isBluetoothPersistedStateOn()) {

        if (isBluetoothPersistedStateOn()) {