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

Commit 26fb43c0 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Multi-user and WallpaperColors 

Test: set different wallpapers for different users and switch between them.
Test: re-ran cts tests at cts/tests/app/src/android/app/cts/WallpaperManagerTest.java
Change-Id: Ic06d1dc6db26869a2948590863ca9b8ac81c630e
Merged-In: Ic06d1dc6db26869a2948590863ca9b8ac81c630e
Fixes: 63513694
parent 615f9e12

core/java/android/app/IWallpaperManager.aidl

+3 −3
Original line number Diff line number Diff line
@@ -144,15 +144,15 @@ interface IWallpaperManager { 
     * or {@link WallpaperManager#FLAG_SYSTEM}

     * @return colors of chosen wallpaper

     */

    WallpaperColors getWallpaperColors(int which);

    WallpaperColors getWallpaperColors(int which, int userId);



    /**

     * Register a callback to receive color updates

     */

    void registerWallpaperColorsCallback(IWallpaperManagerCallback cb);

    void registerWallpaperColorsCallback(IWallpaperManagerCallback cb, int userId);



    /**

     * Unregister a callback that was receiving color updates

     */

    void unregisterWallpaperColorsCallback(IWallpaperManagerCallback cb);

    void unregisterWallpaperColorsCallback(IWallpaperManagerCallback cb, int userId);

}

core/java/android/app/IWallpaperManagerCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ oneway interface IWallpaperManagerCallback { 
    /**

     * Called when wallpaper colors change

     */

    void onWallpaperColorsChanged(in WallpaperColors colors, int which);

    void onWallpaperColorsChanged(in WallpaperColors colors, int which, int userId);



}

core/java/android/app/WallpaperColors.java

+9 −0
Original line number Diff line number Diff line
@@ -408,4 +408,13 @@ public final class WallpaperColors implements Parcelable { 


        return new Size(newWidth, newHeight);

    }



    @Override

    public String toString() {

        final StringBuilder colors = new StringBuilder();

        for (int i = 0; i < mMainColors.size(); i++) {

            colors.append(Integer.toHexString(mMainColors.get(i).toArgb())).append(" ");

        }

        return "[WallpaperColors: " + colors.toString() + "h: " + mColorHints + "]";

    }

}

core/java/android/app/WallpaperManager.java

+69 −16
Original line number Diff line number Diff line
@@ -306,13 +306,14 @@ public class WallpaperManager { 
         * changes its colors.

         * @param callback Listener

         * @param handler Thread to call it from. Main thread if null.

         * @param userId Owner of the wallpaper or UserHandle.USER_ALL

         */

        public void addOnColorsChangedListener(@NonNull OnColorsChangedListener callback,

                @Nullable Handler handler) {

                @Nullable Handler handler, int userId) {

            synchronized (this) {

                if (!mColorCallbackRegistered) {

                    try {

                        mService.registerWallpaperColorsCallback(this);

                        mService.registerWallpaperColorsCallback(this, userId);

                        mColorCallbackRegistered = true;

                    } catch (RemoteException e) {

                        // Failed, service is gone
@@ -327,15 +328,17 @@ public class WallpaperManager { 
         * Stop listening to wallpaper color events.

         *

         * @param callback listener

         * @param userId Owner of the wallpaper or UserHandle.USER_ALL

         */

        public void removeOnColorsChangedListener(@NonNull OnColorsChangedListener callback) {

        public void removeOnColorsChangedListener(@NonNull OnColorsChangedListener callback,

                int userId) {

            synchronized (this) {

                mColorListeners.removeIf(pair -> pair.first == callback);



                if (mColorListeners.size() == 0 && mColorCallbackRegistered) {

                    mColorCallbackRegistered = false;

                    try {

                        mService.unregisterWallpaperColorsCallback(this);

                        mService.unregisterWallpaperColorsCallback(this, userId);

                    } catch (RemoteException e) {

                        // Failed, service is gone

                        Log.w(TAG, "Can't unregister color updates", e);
@@ -345,7 +348,7 @@ public class WallpaperManager { 
        }



        @Override

        public void onWallpaperColorsChanged(WallpaperColors colors, int which) {

        public void onWallpaperColorsChanged(WallpaperColors colors, int which, int userId) {

            synchronized (this) {

                for (Pair<OnColorsChangedListener, Handler> listener : mColorListeners) {

                    Handler handler = listener.second;
@@ -360,21 +363,21 @@ public class WallpaperManager { 
                            stillExists = mColorListeners.contains(listener);

                        }

                        if (stillExists) {

                            listener.first.onColorsChanged(colors, which);

                            listener.first.onColorsChanged(colors, which, userId);

                        }

                    });

                }

            }

        }



        WallpaperColors getWallpaperColors(int which) {

        WallpaperColors getWallpaperColors(int which, int userId) {

            if (which != FLAG_LOCK && which != FLAG_SYSTEM) {

                throw new IllegalArgumentException(

                        "Must request colors for exactly one kind of wallpaper");

            }



            try {

                return mService.getWallpaperColors(which);

                return mService.getWallpaperColors(which, userId);

            } catch (RemoteException e) {

                // Can't get colors, connection lost.

            }
@@ -842,7 +845,7 @@ public class WallpaperManager { 
     * @param listener A listener to register

     */

    public void addOnColorsChangedListener(@NonNull OnColorsChangedListener listener) {

        sGlobals.addOnColorsChangedListener(listener, null);

        addOnColorsChangedListener(listener, null);

    }



    /**
@@ -853,25 +856,61 @@ public class WallpaperManager { 
     */

    public void addOnColorsChangedListener(@NonNull OnColorsChangedListener listener,

            @NonNull Handler handler) {

        sGlobals.addOnColorsChangedListener(listener, handler);

        addOnColorsChangedListener(listener, handler, mContext.getUserId());

    }



    /**

     * Registers a listener to get notified when the wallpaper colors change

     * @param listener A listener to register

     * @param handler Where to call it from. Will be called from the main thread

     *                if null.

     * @param userId Owner of the wallpaper or UserHandle.USER_ALL.

     * @hide

     */

    public void addOnColorsChangedListener(@NonNull OnColorsChangedListener listener,

            @NonNull Handler handler, int userId) {

        sGlobals.addOnColorsChangedListener(listener, handler, userId);

    }



    /**

     * Stop listening to color updates.

     * @param callback A callback to unsubscribe

     * @param callback A callback to unsubscribe.

     */

    public void removeOnColorsChangedListener(@NonNull OnColorsChangedListener callback) {

        sGlobals.removeOnColorsChangedListener(callback);

        removeOnColorsChangedListener(callback, mContext.getUserId());

    }



    /**

     * Stop listening to color updates.

     * @param callback A callback to unsubscribe.

     * @param userId Owner of the wallpaper or UserHandle.USER_ALL.

     * @hide

     */

    public void removeOnColorsChangedListener(@NonNull OnColorsChangedListener callback,

            int userId) {

        sGlobals.removeOnColorsChangedListener(callback, userId);

    }



    /**

     * Get the primary colors of a wallpaper

     * @param which wallpaper type. Must be either {@link #FLAG_SYSTEM} or

     *     {@link #FLAG_LOCK}

     * @return a list of colors ordered by priority

     * @return {@link WallpaperColors} or null if colors are unknown.

     */

    public @Nullable WallpaperColors getWallpaperColors(int which) {

        return sGlobals.getWallpaperColors(which);

        return getWallpaperColors(which, mContext.getUserId());

    }



    /**

     * Get the primary colors of a wallpaper

     * @param which wallpaper type. Must be either {@link #FLAG_SYSTEM} or

     *     {@link #FLAG_LOCK}

     * @param userId Owner of the wallpaper.

     * @return {@link WallpaperColors} or null if colors are unknown.

     * @hide

     */

    public @Nullable WallpaperColors getWallpaperColors(int which, int userId) {

        return sGlobals.getWallpaperColors(which, userId);

    }



    /**
@@ -1867,9 +1906,9 @@ public class WallpaperManager { 
        }



        @Override

        public void onWallpaperColorsChanged(WallpaperColors colors, int which)

        public void onWallpaperColorsChanged(WallpaperColors colors, int which, int userId)

            throws RemoteException {

            sGlobals.onWallpaperColorsChanged(colors, which);

            sGlobals.onWallpaperColorsChanged(colors, which, userId);

        }

    }
@@ -1886,5 +1925,19 @@ public class WallpaperManager { 
         * @param which A combination of {@link #FLAG_LOCK} and {@link #FLAG_SYSTEM}

         */

        void onColorsChanged(WallpaperColors colors, int which);



        /**

         * Called when colors change.

         * A {@link android.app.WallpaperColors} object containing a simplified

         * color histogram will be given.

         *

         * @param colors Wallpaper color info

         * @param which A combination of {@link #FLAG_LOCK} and {@link #FLAG_SYSTEM}

         * @param userId Owner of the wallpaper

         * @hide

         */

        default void onColorsChanged(WallpaperColors colors, int which, int userId) {

            onColorsChanged(colors, which);

        }

    }

}

core/java/android/service/wallpaper/IWallpaperEngine.aidl

+1 −0
Original line number Diff line number Diff line
@@ -30,5 +30,6 @@ oneway interface IWallpaperEngine { 
    void dispatchPointer(in MotionEvent event);

    void dispatchWallpaperCommand(String action, int x, int y,

            int z, in Bundle extras);

    void requestWallpaperColors();

    void destroy();

}