Merge "Invoke the correct callback for TOO_MANY_REQUESTS and PENDING responses." into udc-qpr-dev (58a1d61a) · Commits · e / os / android_frameworks_base

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(