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

Commit 2ea36d45 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Removed direct calls to AMS.broadcastIntentLocked from ATMS (26/n) 

The method is internal to AMS so can't be called directly from ATMS
which will be in a different package soon.

Bug: 80414790
Test: Existing tests pass
Change-Id: If36c7d9cb65e848101070f6b412c9067ee33741e
parent 9c103022

core/java/android/app/ActivityManagerInternal.java

+12 −0
Original line number Diff line number Diff line
@@ -250,4 +250,16 @@ public abstract class ActivityManagerInternal { 
    public abstract boolean inputDispatchingTimedOut(Object proc, String activityShortComponentName,

            ApplicationInfo aInfo, String parentShortComponentName, Object parentProc,

            boolean aboveSystem, String reason);



    /**

     * Sends {@link android.content.Intent#ACTION_CONFIGURATION_CHANGED} with all the appropriate

     * flags.

     */

    public abstract void broadcastGlobalConfigurationChanged(int changes, boolean initLocale);



    /**

     * Sends {@link android.content.Intent#ACTION_CLOSE_SYSTEM_DIALOGS} with all the appropriate

     * flags.

     */

    public abstract void broadcastCloseSystemDialogs(String reason);

}

services/core/java/com/android/server/am/ActivityManagerService.java

+64 −0
Original line number Diff line number Diff line
@@ -20338,6 +20338,70 @@ public class ActivityManagerService extends IActivityManager.Stub 
                    (WindowProcessController) parentProc, aboveSystem, reason);















        }

























        @Override













        public void broadcastGlobalConfigurationChanged(int changes, boolean initLocale) {













            synchronized (ActivityManagerService.this) {













                Intent intent = new Intent(Intent.ACTION_CONFIGURATION_CHANGED);













                intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY













                        | Intent.FLAG_RECEIVER_REPLACE_PENDING













                        | Intent.FLAG_RECEIVER_FOREGROUND













                        | Intent.FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS);













                broadcastIntentLocked(null, null, intent, null, null, 0, null, null, null,













                        OP_NONE, null, false, false, MY_PID, SYSTEM_UID,













                        UserHandle.USER_ALL);













                if ((changes & ActivityInfo.CONFIG_LOCALE) != 0) {













                    intent = new Intent(Intent.ACTION_LOCALE_CHANGED);













                    intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND













                            | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND













                            | Intent.FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS);













                    if (initLocale || !mProcessesReady) {













                        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);













                    }













                    broadcastIntentLocked(null, null, intent, null, null, 0, null, null, null,













                            OP_NONE, null, false, false, MY_PID, SYSTEM_UID,













                            UserHandle.USER_ALL);













                }

























                // Send a broadcast to PackageInstallers if the configuration change is interesting













                // for the purposes of installing additional splits.













                if (!initLocale && isSplitConfigurationChange(changes)) {













                    intent = new Intent(Intent.ACTION_SPLIT_CONFIGURATION_CHANGED);













                    intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING













                            | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

























                    // Typically only app stores will have this permission.













                    String[] permissions =













                            new String[] { android.Manifest.permission.INSTALL_PACKAGES };













                    broadcastIntentLocked(null, null, intent, null, null, 0, null, null,













                            permissions, OP_NONE, null, false, false, MY_PID, SYSTEM_UID,













                            UserHandle.USER_ALL);













                }













            }













        }

























        /**













         * Returns true if this configuration change is interesting enough to send an













         * {@link Intent#ACTION_SPLIT_CONFIGURATION_CHANGED} broadcast.













         */













        private boolean isSplitConfigurationChange(int configDiff) {













            return (configDiff & (ActivityInfo.CONFIG_LOCALE | ActivityInfo.CONFIG_DENSITY)) != 0;













        }

























        @Override













        public void broadcastCloseSystemDialogs(String reason) {













            synchronized (ActivityManagerService.this) {













                final Intent intent = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);













                intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY













                        | Intent.FLAG_RECEIVER_FOREGROUND);













                if (reason != null) {













                    intent.putExtra("reason", reason);













                }

























                broadcastIntentLocked(null, null, intent, null, null, 0, null, null, null,













                        OP_NONE, null, false, false, -1, SYSTEM_UID, UserHandle.USER_ALL);













            }













        }















    }





























    long inputDispatchingTimedOut(int pid, final boolean aboveSystem, String reason) {

























services/core/java/com/android/server/am/ActivityTaskManagerService.java



+6
−50




























Original line number
Diff line number
Diff line








@@ -4670,14 +4670,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {













        return kept;















    }





























    /**













     * Returns true if this configuration change is interesting enough to send an













     * {@link Intent#ACTION_SPLIT_CONFIGURATION_CHANGED} broadcast.













     */













    private static boolean isSplitConfigurationChange(int configDiff) {













        return (configDiff & (ActivityInfo.CONFIG_LOCALE | ActivityInfo.CONFIG_DENSITY)) != 0;













    }





























    /** Update default (global) configuration and notify listeners about changes. */















    private int updateGlobalConfigurationLocked(@NonNull Configuration values, boolean initLocale,















            boolean persistent, int userId, boolean deferResume) {










@@ -4777,38 +4769,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {













            app.onConfigurationChanged(configCopy);















        }





























        Intent intent = new Intent(Intent.ACTION_CONFIGURATION_CHANGED);













        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY | Intent.FLAG_RECEIVER_REPLACE_PENDING













                | Intent.FLAG_RECEIVER_FOREGROUND













                | Intent.FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS);













        mAm.broadcastIntentLocked(null, null, intent, null, null, 0, null, null, null,













                OP_NONE, null, false, false, MY_PID, SYSTEM_UID,













                UserHandle.USER_ALL);













        if ((changes & ActivityInfo.CONFIG_LOCALE) != 0) {













            intent = new Intent(Intent.ACTION_LOCALE_CHANGED);













            intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND













                    | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND













                    | Intent.FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS);













            if (initLocale || !mAm.mProcessesReady) {













                intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);













            }













            mAm.broadcastIntentLocked(null, null, intent, null, null, 0, null, null, null,













                    OP_NONE, null, false, false, MY_PID, SYSTEM_UID,













                    UserHandle.USER_ALL);













        }



























        // Send a broadcast to PackageInstallers if the configuration change is interesting













        // for the purposes of installing additional splits.













        if (!initLocale && isSplitConfigurationChange(changes)) {













            intent = new Intent(Intent.ACTION_SPLIT_CONFIGURATION_CHANGED);













            intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING













                    | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);



























            // Typically only app stores will have this permission.













            String[] permissions = new String[] { android.Manifest.permission.INSTALL_PACKAGES };













            mAm.broadcastIntentLocked(null, null, intent, null, null, 0, null, null, permissions,













                    OP_NONE, null, false, false, MY_PID, SYSTEM_UID, UserHandle.USER_ALL);













        }













        final Message msg = PooledLambda.obtainMessage(













                ActivityManagerInternal::broadcastGlobalConfigurationChanged,













                mAmInternal, changes, initLocale);













        mH.sendMessage(msg);































        // Override configuration of the default display duplicates global config, so we need to















        // update it also. This will also notify WindowManager about changes.










@@ -6247,20 +6211,12 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {













                            return;















                        }















                    }













                    Intent intent = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);













                    intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY













                            | Intent.FLAG_RECEIVER_FOREGROUND);













                    if (reason != null) {













                        intent.putExtra("reason", reason);













                    }















                    mWindowManager.closeSystemDialogs(reason);































                    mStackSupervisor.closeSystemDialogsLocked();



























                    mAm.broadcastIntentLocked(null, null, intent, null, null, 0, null, null, null,













                            OP_NONE, null, false, false,













                            -1, SYSTEM_UID, UserHandle.USER_ALL);















                }













                // Call into AM outside the synchronized block.













                mAmInternal.broadcastCloseSystemDialogs(reason);















            } finally {















                Binder.restoreCallingIdentity(origId);















            }