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

Commit d437cac1 authored by Deepika Likhite's avatar Deepika Likhite Committed by Android (Google) Code Review
Browse files

Revert "Unblock the registration of shortcut change callbacks" 

This reverts commit efd686af.

Reason for revert: Reverting as part of the https://b.corp.google.com/issues/345035133#comment19

Change-Id: If950e48fa1392dcafdd49a36e3f3f0d3df973669
parent efd686af

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

+7 −10
Original line number Diff line number Diff line
@@ -320,10 +320,10 @@ public class ShortcutService extends IShortcutService.Stub { 


    private final Handler mHandler;



    @GuardedBy("itself")

    @GuardedBy("mServiceLock")

    private final ArrayList<ShortcutChangeListener> mListeners = new ArrayList<>(1);



    @GuardedBy("itself")

    @GuardedBy("mServiceLock")

    private final ArrayList<LauncherApps.ShortcutChangeCallback> mShortcutChangeCallbacks =

            new ArrayList<>(1);
@@ -1847,10 +1847,8 @@ public class ShortcutService extends IShortcutService.Stub { 
                        return;

                    }



                    synchronized (mListeners) {

                    copy = new ArrayList<>(mListeners);

                }

                }

                // Note onShortcutChanged() needs to be called with the system service permissions.

                for (int i = copy.size() - 1; i >= 0; i--) {

                    copy.get(i).onShortcutChanged(packageName, userId);
@@ -1874,10 +1872,9 @@ public class ShortcutService extends IShortcutService.Stub { 
                    if (!isUserUnlockedL(userId)) {

                        return;

                    }

                    synchronized (mShortcutChangeCallbacks) {



                    copy = new ArrayList<>(mShortcutChangeCallbacks);

                }

                }

                for (int i = copy.size() - 1; i >= 0; i--) {

                    if (!CollectionUtils.isEmpty(changedList)) {

                        copy.get(i).onShortcutsAddedOrUpdated(packageName, changedList, user);
@@ -3428,7 +3425,7 @@ public class ShortcutService extends IShortcutService.Stub { 


        @Override

        public void addListener(@NonNull ShortcutChangeListener listener) {

            synchronized (mListeners) {

            synchronized (mServiceLock) {

                mListeners.add(Objects.requireNonNull(listener));

            }

        }
@@ -3436,7 +3433,7 @@ public class ShortcutService extends IShortcutService.Stub { 
        @Override

        public void addShortcutChangeCallback(

                @NonNull LauncherApps.ShortcutChangeCallback callback) {

            synchronized (mShortcutChangeCallbacks) {

            synchronized (mServiceLock) {

                mShortcutChangeCallbacks.add(Objects.requireNonNull(callback));

            }

        }