Snap for 9274385 from 887d4bb67f255bf90bb5863e8178854d3dd01c2f to tm-qpr2-release (aa73a148) · Commits · e / os / android_frameworks_base

core/java/android/animation/AnimationHandler.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -219,14 +219,16 @@ public class AnimationHandler {
		return;
		}
		for (int i = 0; i < mAnimationCallbacks.size(); ++i) {
		Animator animator = ((Animator) mAnimationCallbacks.get(i));
		if (animator != null
		&& animator.getTotalDuration() == Animator.DURATION_INFINITE
		AnimationFrameCallback callback = mAnimationCallbacks.get(i);
		if (callback instanceof Animator) {
		Animator animator = ((Animator) callback);
		if (animator.getTotalDuration() == Animator.DURATION_INFINITE
		&& !animator.isPaused()) {
		mPausedAnimators.add(animator);
		animator.pause();
		}
		}
		}
		};

		/**

core/java/android/app/DisabledWallpaperManager.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -192,6 +192,16 @@ final class DisabledWallpaperManager extends WallpaperManager {
		return unsupported();
		}

		@Override
		public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which) {
		return unsupported();
		}

		@Override
		public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which, int userId) {
		return unsupported();
		}

		@Override
		public int getWallpaperId(int which) {
		return unsupportedInt();

core/java/android/app/WallpaperManager.java

+27 −6

Original line number	Diff line number	Diff line
		@@ -1320,18 +1320,16 @@ public class WallpaperManager {
		}

		/**
		* Returns the information about the wallpaper if the current wallpaper is
		* a live wallpaper component. Otherwise, if the wallpaper is a static image,
		* this returns null.
		* Returns the information about the home screen wallpaper if its current wallpaper is a live
		* wallpaper component. Otherwise, if the wallpaper is a static image, this returns null.
		*/
		public WallpaperInfo getWallpaperInfo() {
		return getWallpaperInfo(mContext.getUserId());
		}

		/**
		* Returns the information about the wallpaper if the current wallpaper is
		* a live wallpaper component. Otherwise, if the wallpaper is a static image,
		* this returns null.
		* Returns the information about the home screen wallpaper if its current wallpaper is a live
		* wallpaper component. Otherwise, if the wallpaper is a static image, this returns null.
		*
		* @param userId Owner of the wallpaper.
		* @hide
		@@ -1349,6 +1347,29 @@ public class WallpaperManager {
		}
		}

		/**
		* Returns the information about the home screen wallpaper if its current wallpaper is a live
		* wallpaper component. Otherwise, if the wallpaper is a static image, this returns null.
		*
		* @param which Specifies wallpaper destination (home or lock).
		* @hide
		*/
		public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which) {
		return getWallpaperInfo();
		}

		/**
		* Returns the information about the designated wallpaper if its current wallpaper is a live
		* wallpaper component. Otherwise, if the wallpaper is a static image, this returns null.
		*
		* @param which Specifies wallpaper destination (home or lock).
		* @param userId Owner of the wallpaper.
		* @hide
		*/
		public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which, int userId) {
		return getWallpaperInfo(userId);
		}

		/**
		* Get the ID of the current wallpaper of the given kind. If there is no
		* such wallpaper configured, returns a negative number.

core/java/com/android/internal/app/ChooserActivity.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -2096,7 +2096,8 @@ public class ChooserActivity extends ResolverActivity implements
		return matchingShortcuts;
		}

		private void sendShortcutManagerShareTargetResults(
		@VisibleForTesting
		protected void sendShortcutManagerShareTargetResults(
		int shortcutType, ServiceResultInfo[] results) {
		final Message msg = Message.obtain();
		msg.what = ChooserHandler.SHORTCUT_MANAGER_ALL_SHARE_TARGET_RESULTS;
		@@ -3873,7 +3874,11 @@ public class ChooserActivity extends ResolverActivity implements
		}
		}

		static class ServiceResultInfo {
		/**
		* Shortcuts grouped by application.
		*/
		@VisibleForTesting
		public static class ServiceResultInfo {
		public final DisplayResolveInfo originalTarget;
		public final List<ChooserTarget> resultTargets;
		public final UserHandle userHandle;

core/java/com/android/internal/jank/InteractionJankMonitor.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_LAUNCH_FROM_ICON;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_LAUNCH_FROM_RECENTS;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_LAUNCH_FROM_WIDGET;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_SWIPE_TO_RECENTS;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_OPEN_ALL_APPS;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_QUICK_SWITCH;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_UNLOCK_ENTRANCE_ANIMATION;
		@@ -225,6 +226,7 @@ public class InteractionJankMonitor {
		public static final int CUJ_LAUNCHER_UNLOCK_ENTRANCE_ANIMATION = 63;
		public static final int CUJ_LOCKSCREEN_OCCLUSION = 64;
		public static final int CUJ_RECENTS_SCROLLING = 65;
		public static final int CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS = 66;

		private static final int NO_STATSD_LOGGING = -1;

		@@ -299,6 +301,7 @@ public class InteractionJankMonitor {
		UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_UNLOCK_ENTRANCE_ANIMATION,
		UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_OCCLUSION,
		UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__RECENTS_SCROLLING,
		UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_SWIPE_TO_RECENTS,
		};

		private static volatile InteractionJankMonitor sInstance;
		@@ -384,7 +387,8 @@ public class InteractionJankMonitor {
		CUJ_SHADE_CLEAR_ALL,
		CUJ_LAUNCHER_UNLOCK_ENTRANCE_ANIMATION,
		CUJ_LOCKSCREEN_OCCLUSION,
		CUJ_RECENTS_SCROLLING
		CUJ_RECENTS_SCROLLING,
		CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface CujType {
		@@ -899,6 +903,8 @@ public class InteractionJankMonitor {
		return "LOCKSCREEN_OCCLUSION";
		case CUJ_RECENTS_SCROLLING:
		return "RECENTS_SCROLLING";
		case CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS:
		return "LAUNCHER_APP_SWIPE_TO_RECENTS";
		}
		return "UNKNOWN";
		}