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

Commit 69469059 authored by Pinyao Ting's avatar Pinyao Ting
Browse files

Unblock the registration of shortcut callbacks 

Bug: 328095956
Test: atest CtsShortcutManagerTestCases
Change-Id: Iae206ef5b4460f5b0d2e9444edb985483ca5e990
parent a7136d36

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

+17 −32
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.content.pm.ComponentInfo; 
import android.content.pm.IPackageManager;

import android.content.pm.IShortcutService;

import android.content.pm.LauncherApps;

import android.content.pm.LauncherApps.ShortcutChangeCallback;

import android.content.pm.LauncherApps.ShortcutQuery;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;
@@ -151,6 +152,7 @@ import java.util.Arrays; 
import java.util.Collections;

import java.util.List;

import java.util.Objects;

import java.util.concurrent.CopyOnWriteArrayList;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.concurrent.atomic.AtomicLong;

import java.util.function.Consumer;
@@ -320,12 +322,11 @@ public class ShortcutService extends IShortcutService.Stub { 


    private final Handler mHandler;



    @GuardedBy("mLock")

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

    private final CopyOnWriteArrayList<ShortcutChangeListener> mListeners =

            new CopyOnWriteArrayList<>();



    @GuardedBy("mLock")

    private final ArrayList<LauncherApps.ShortcutChangeCallback> mShortcutChangeCallbacks =

            new ArrayList<>(1);

    private final CopyOnWriteArrayList<ShortcutChangeCallback> mShortcutChangeCallbacks =

            new CopyOnWriteArrayList<>();



    private final AtomicLong mRawLastResetTime = new AtomicLong(0);
@@ -1841,18 +1842,11 @@ public class ShortcutService extends IShortcutService.Stub { 
            @UserIdInt final int userId) {

        return () -> {

            try {

                final ArrayList<ShortcutChangeListener> copy;

                synchronized (mLock) {

                if (!isUserUnlockedL(userId)) {

                    return;

                }



                    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);

                }

                mListeners.forEach(listener -> listener.onShortcutChanged(packageName, userId));

            } catch (Exception ignore) {

            }

        };
@@ -1867,22 +1861,17 @@ public class ShortcutService extends IShortcutService.Stub { 
        final UserHandle user = UserHandle.of(userId);

        injectPostToHandler(() -> {

            try {

                final ArrayList<LauncherApps.ShortcutChangeCallback> copy;

                synchronized (mLock) {

                if (!isUserUnlockedL(userId)) {

                    return;

                }



                    copy = new ArrayList<>(mShortcutChangeCallbacks);

                }

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

                mShortcutChangeCallbacks.forEach(callback -> {

                    if (!CollectionUtils.isEmpty(changedList)) {

                        copy.get(i).onShortcutsAddedOrUpdated(packageName, changedList, user);

                        callback.onShortcutsAddedOrUpdated(packageName, changedList, user);

                    }

                    if (!CollectionUtils.isEmpty(removedList)) {

                        copy.get(i).onShortcutsRemoved(packageName, removedList, user);

                    }

                        callback.onShortcutsRemoved(packageName, removedList, user);

                    }

                });

            } catch (Exception ignore) {

            }

        });
@@ -3425,18 +3414,14 @@ public class ShortcutService extends IShortcutService.Stub { 


        @Override

        public void addListener(@NonNull ShortcutChangeListener listener) {

            synchronized (mLock) {

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

        }

        }



        @Override

        public void addShortcutChangeCallback(

                @NonNull LauncherApps.ShortcutChangeCallback callback) {

            synchronized (mLock) {

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

        }

        }



        @Override

        public int getShortcutIconResId(int launcherUserId, @NonNull String callingPackage,