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

Commit 060df6a5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add debug logs to LauncherApps to debug missing package broadcasts" into main

parents cf49f9bf 5f206235

core/java/android/content/pm/LauncherApps.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -2142,9 +2142,7 @@ public class LauncherApps { 




        @Override

        @Override

        public void onPackageAdded(UserHandle user, String packageName) throws RemoteException {

        public void onPackageAdded(UserHandle user, String packageName) throws RemoteException {

            if (DEBUG) {

            Log.d(TAG, "onPackageAdded " + user.getIdentifier() + "," + packageName);

            Log.d(TAG, "onPackageAdded " + user.getIdentifier() + "," + packageName);

            }

            synchronized (LauncherApps.this) {

            synchronized (LauncherApps.this) {

                for (CallbackMessageHandler callback : mCallbacks) {

                for (CallbackMessageHandler callback : mCallbacks) {

                    callback.postOnPackageAdded(packageName, user);

                    callback.postOnPackageAdded(packageName, user);

services/core/java/com/android/server/pm/LauncherAppsService.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -444,6 +444,7 @@ public class LauncherAppsService extends SystemService { 
         */

         */

        private void startWatchingPackageBroadcasts() {

        private void startWatchingPackageBroadcasts() {

            if (!mIsWatchingPackageBroadcasts) {

            if (!mIsWatchingPackageBroadcasts) {

                Slog.d(TAG, "Started watching for package broadcasts");

                final IntentFilter filter = new IntentFilter();

                final IntentFilter filter = new IntentFilter();

                filter.addAction(Intent.ACTION_PACKAGE_REMOVED_INTERNAL);

                filter.addAction(Intent.ACTION_PACKAGE_REMOVED_INTERNAL);

                filter.addDataScheme("package");

                filter.addDataScheme("package");
@@ -463,9 +464,7 @@ public class LauncherAppsService extends SystemService { 
         * Unregister package broadcast receiver

         * Unregister package broadcast receiver

         */

         */

        private void stopWatchingPackageBroadcasts() {

        private void stopWatchingPackageBroadcasts() {

            if (DEBUG) {

            Slog.d(TAG, "Stopped watching for package broadcasts");

                Log.d(TAG, "Stopped watching for packages");

            }

            if (mIsWatchingPackageBroadcasts) {

            if (mIsWatchingPackageBroadcasts) {

                mContext.unregisterReceiver(mPackageRemovedListener);

                mContext.unregisterReceiver(mPackageRemovedListener);

                mPackageMonitor.unregister();

                mPackageMonitor.unregister();
@@ -2588,6 +2587,7 @@ public class LauncherAppsService extends SystemService { 
            @Override

            @Override

            public void onPackageAdded(String packageName, int uid) {

            public void onPackageAdded(String packageName, int uid) {

                UserHandle user = new UserHandle(getChangingUserId());

                UserHandle user = new UserHandle(getChangingUserId());

                Slog.d(TAG, "onPackageAdded: user=" + user + ", packageName=" + packageName);

                final int n = mListeners.beginBroadcast();

                final int n = mListeners.beginBroadcast();

                try {

                try {

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

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