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

Commit ef687114 authored by Sharon Su's avatar Sharon Su Committed by Automerger Merge Worker
Browse files

Merge "Invoke the correct callback for TOO_MANY_REQUESTS and PENDING... 

Merge "Invoke the correct callback for TOO_MANY_REQUESTS and PENDING responses." into udc-qpr-dev am: 58a1d61a am: 0722b113

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24630874



Change-Id: Iaabe99ea29d245351c195326121e363eed082275
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 21dc4e27 0722b113

services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationPerUserService.java

+19 −11
Original line number Diff line number Diff line
@@ -95,21 +95,29 @@ public class WallpaperEffectsGenerationPerUserService extends 
        String newTaskId = cinematicEffectRequest.getTaskId();

        // Previous request is still being processed.

        if (mCinematicEffectListenerWrapper != null) {

            CinematicEffectResponse cinematicEffectResponse;

            if (mCinematicEffectListenerWrapper.mTaskId.equals(newTaskId)) {

                invokeCinematicListenerAndCleanup(

                        new CinematicEffectResponse.Builder(

                cinematicEffectResponse =  new CinematicEffectResponse.Builder(

                        CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_PENDING, newTaskId)

                                .build()

                );

                        .build();

            } else {

                invokeCinematicListenerAndCleanup(

                        new CinematicEffectResponse.Builder(

                cinematicEffectResponse =  new CinematicEffectResponse.Builder(

                        CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_TOO_MANY_REQUESTS,

                                newTaskId).build()

                );

                        newTaskId)

                        .build();

            }

            try {

                cinematicEffectListener.onCinematicEffectGenerated(cinematicEffectResponse);

                return;

            } catch (RemoteException e) {

                if (isDebug()) {

                    Slog.w(TAG, "RemoteException invoking cinematic effect listener for task["

                            + mCinematicEffectListenerWrapper.mTaskId + "]");

                }

                return;

            }

        }



        RemoteWallpaperEffectsGenerationService remoteService = ensureRemoteServiceLocked();

        if (remoteService != null) {

            remoteService.executeOnResolvedService(