Snap for 8609386 from 22703341cb681afbfcaba4ba439e03959686d480 to tm-release (a8d6cbc6) · Commits · e / os / android_frameworks_base

core/java/android/hardware/CameraSessionStats.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ public class CameraSessionStats implements Parcelable {
		private float mMaxPreviewFps;
		private ArrayList<CameraStreamStats> mStreamStats;
		private String mUserTag;
		private int mVideoStabilizationMode;

		public CameraSessionStats() {
		mFacing = -1;
		@@ -76,6 +77,7 @@ public class CameraSessionStats implements Parcelable {
		mResultErrorCount = 0;
		mDeviceError = false;
		mStreamStats = new ArrayList<CameraStreamStats>();
		mVideoStabilizationMode = -1;
		}

		public CameraSessionStats(String cameraId, int facing, int newCameraState,
		@@ -133,6 +135,7 @@ public class CameraSessionStats implements Parcelable {
		dest.writeBoolean(mDeviceError);
		dest.writeTypedList(mStreamStats);
		dest.writeString(mUserTag);
		dest.writeInt(mVideoStabilizationMode);
		}

		public void readFromParcel(Parcel in) {
		@@ -155,6 +158,7 @@ public class CameraSessionStats implements Parcelable {
		mStreamStats = streamStats;

		mUserTag = in.readString();
		mVideoStabilizationMode = in.readInt();
		}

		public String getCameraId() {
		@@ -216,4 +220,8 @@ public class CameraSessionStats implements Parcelable {
		public String getUserTag() {
		return mUserTag;
		}

		public int getVideoStabilizationMode() {
		return mVideoStabilizationMode;
		}
		}

core/java/android/util/SparseSetArray.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -38,10 +38,7 @@ public class SparseSetArray<T> {
		for (int i = 0; i < arraySize; i++) {
		final int key = src.keyAt(i);
		final ArraySet<T> set = src.get(key);
		final int setSize = set.size();
		for (int j = 0; j < setSize; j++) {
		add(key, set.valueAt(j));
		}
		addAll(key, set);
		}
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -642,7 +642,8 @@ public class ResolverActivity extends Activity implements

		if (shouldUseMiniResolver()) {
		View buttonContainer = findViewById(R.id.button_bar_container);
		buttonContainer.setPadding(0, 0, 0, mSystemWindowInsets.bottom);
		buttonContainer.setPadding(0, 0, 0, mSystemWindowInsets.bottom
		+ getResources().getDimensionPixelOffset(R.dimen.resolver_button_bar_spacing));
		}

		// Need extra padding so the list can fully scroll up

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -549,6 +549,18 @@ public final class SystemUiDeviceConfigFlags {
		*/
		public static final String PERSISTS_WIDGET_PROVIDER_INFO = "persists_widget_provider_info";

		/**
		* (boolean) Whether the clipboard overlay shows an edit button (as opposed to requiring tapping
		* the preview to send an edit intent).
		*/
		public static final String CLIPBOARD_OVERLAY_SHOW_EDIT_BUTTON =
		"clipboard_overlay_show_edit_button";

		/**
		* (boolean) Whether to show smart chips (based on TextClassifier) in the clipboard overlay.
		*/
		public static final String CLIPBOARD_OVERLAY_SHOW_ACTIONS = "clipboard_overlay_show_actions";

		private SystemUiDeviceConfigFlags() {
		}
		}

core/java/com/android/internal/policy/TransitionAnimation.java

+8 −11

Original line number	Diff line number	Diff line
		@@ -29,8 +29,6 @@ import static android.view.WindowManager.TRANSIT_OLD_WALLPAPER_INTRA_CLOSE;
		import static android.view.WindowManager.TRANSIT_OLD_WALLPAPER_INTRA_OPEN;
		import static android.view.WindowManager.TRANSIT_OPEN;

		import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_ANIM;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.ActivityManager;
		@@ -62,7 +60,6 @@ import android.view.animation.ScaleAnimation;
		import android.view.animation.TranslateAnimation;

		import com.android.internal.R;
		import com.android.internal.protolog.common.ProtoLog;

		import java.util.List;

		@@ -298,9 +295,9 @@ public class TransitionAnimation {
		@Nullable
		private AttributeCache.Entry getCachedAnimations(LayoutParams lp) {
		if (mDebug) {
		ProtoLog.v(WM_DEBUG_ANIM, "Loading animations: layout params pkg=%s resId=0x%x",
		lp != null ? lp.packageName : null,
		lp != null ? lp.windowAnimations : 0);
		Slog.v(mTag, "Loading animations: layout params pkg="
		+ (lp != null ? lp.packageName : null)
		+ " resId=0x" + (lp != null ? Integer.toHexString(lp.windowAnimations) : null));
		}
		if (lp != null && lp.windowAnimations != 0) {
		// If this is a system resource, don't try to load it from the
		@@ -312,7 +309,7 @@ public class TransitionAnimation {
		packageName = DEFAULT_PACKAGE;
		}
		if (mDebug) {
		ProtoLog.v(WM_DEBUG_ANIM, "Loading animations: picked package=%s", packageName);
		Slog.v(mTag, "Loading animations: picked package=" + packageName);
		}
		return AttributeCache.instance().get(packageName, resId,
		com.android.internal.R.styleable.WindowAnimation);
		@@ -323,16 +320,16 @@ public class TransitionAnimation {
		@Nullable
		private AttributeCache.Entry getCachedAnimations(String packageName, int resId) {
		if (mDebug) {
		ProtoLog.v(WM_DEBUG_ANIM, "Loading animations: package=%s resId=0x%x",
		packageName, resId);
		Slog.v(mTag, "Loading animations: package="
		+ packageName + " resId=0x" + Integer.toHexString(resId));
		}
		if (packageName != null) {
		if ((resId & 0xFF000000) == 0x01000000) {
		packageName = DEFAULT_PACKAGE;
		}
		if (mDebug) {
		ProtoLog.v(WM_DEBUG_ANIM, "Loading animations: picked package=%s",
		packageName);
		Slog.v(mTag, "Loading animations: picked package="
		+ packageName);
		}
		return AttributeCache.instance().get(packageName, resId,
		com.android.internal.R.styleable.WindowAnimation);