Snap for 8832598 from 3bf28cdf42f4688c147ee24cb86328bf36f7b3a3 to tm-qpr1-release (192d594a) · Commits · e / os / android_frameworks_base

core/java/android/app/search/SearchAction.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ public final class SearchAction implements Parcelable {
		private final UserHandle mUserHandle;

		@Nullable
		private Bundle mExtras;
		private final Bundle mExtras;

		SearchAction(Parcel in) {
		mId = in.readString();
		@@ -99,7 +99,7 @@ public final class SearchAction implements Parcelable {
		mPendingIntent = pendingIntent;
		mIntent = intent;
		mUserHandle = userHandle;
		mExtras = extras;
		mExtras = extras != null ? extras : new Bundle();

		if (mPendingIntent == null && mIntent == null) {
		throw new IllegalStateException("At least one type of intent should be available.");

core/java/android/app/search/SearchTarget.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -185,7 +185,7 @@ public final class SearchTarget implements Parcelable {
		mShortcutInfo = shortcutInfo;
		mAppWidgetProviderInfo = appWidgetProviderInfo;
		mSliceUri = sliceUri;
		mExtras = extras;
		mExtras = extras != null ? extras : new Bundle();

		int published = 0;
		if (mSearchAction != null) published++;

core/java/android/view/WindowLayout.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -118,11 +118,11 @@ public class WindowLayout {
		}
		if (cutoutMode == LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES) {
		if (displayFrame.width() < displayFrame.height()) {
		displayCutoutSafeExceptMaybeBars.top = Integer.MIN_VALUE;
		displayCutoutSafeExceptMaybeBars.bottom = Integer.MAX_VALUE;
		displayCutoutSafeExceptMaybeBars.top = MIN_Y;
		displayCutoutSafeExceptMaybeBars.bottom = MAX_Y;
		} else {
		displayCutoutSafeExceptMaybeBars.left = Integer.MIN_VALUE;
		displayCutoutSafeExceptMaybeBars.right = Integer.MAX_VALUE;
		displayCutoutSafeExceptMaybeBars.left = MIN_X;
		displayCutoutSafeExceptMaybeBars.right = MAX_X;
		}
		}
		final boolean layoutInsetDecor = (attrs.flags & FLAG_LAYOUT_INSET_DECOR) != 0;
		@@ -132,23 +132,23 @@ public class WindowLayout {
		final Insets systemBarsInsets = state.calculateInsets(
		displayFrame, WindowInsets.Type.systemBars(), requestedVisibilities);
		if (systemBarsInsets.left > 0) {
		displayCutoutSafeExceptMaybeBars.left = Integer.MIN_VALUE;
		displayCutoutSafeExceptMaybeBars.left = MIN_X;
		}
		if (systemBarsInsets.top > 0) {
		displayCutoutSafeExceptMaybeBars.top = Integer.MIN_VALUE;
		displayCutoutSafeExceptMaybeBars.top = MIN_Y;
		}
		if (systemBarsInsets.right > 0) {
		displayCutoutSafeExceptMaybeBars.right = Integer.MAX_VALUE;
		displayCutoutSafeExceptMaybeBars.right = MAX_X;
		}
		if (systemBarsInsets.bottom > 0) {
		displayCutoutSafeExceptMaybeBars.bottom = Integer.MAX_VALUE;
		displayCutoutSafeExceptMaybeBars.bottom = MAX_Y;
		}
		}
		if (type == TYPE_INPUT_METHOD) {
		final InsetsSource navSource = state.peekSource(ITYPE_NAVIGATION_BAR);
		if (navSource != null && navSource.calculateInsets(displayFrame, true).bottom > 0) {
		// The IME can always extend under the bottom cutout if the navbar is there.
		displayCutoutSafeExceptMaybeBars.bottom = Integer.MAX_VALUE;
		displayCutoutSafeExceptMaybeBars.bottom = MAX_Y;
		}
		}
		final boolean attachedInParent = attachedWindowFrame != null && !layoutInScreen;

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

+185 −118

Original line number	Diff line number	Diff line
		@@ -26,10 +26,12 @@ import static android.view.SurfaceControl.JankData.SURFACE_FLINGER_SCHEDULING;

		import static com.android.internal.jank.InteractionJankMonitor.ACTION_SESSION_CANCEL;
		import static com.android.internal.jank.InteractionJankMonitor.ACTION_SESSION_END;
		import static com.android.internal.jank.InteractionJankMonitor.EXECUTOR_TASK_TIMEOUT;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.UiThread;
		import android.graphics.HardwareRendererObserver;
		import android.os.Handler;
		import android.os.Trace;
		@@ -85,8 +87,9 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		public @interface Reasons {
		}

		@VisibleForTesting
		public final InteractionJankMonitor mMonitor;
		private final HardwareRendererObserver mObserver;
		private SurfaceControl mSurfaceControl;
		private final int mTraceThresholdMissedFrames;
		private final int mTraceThresholdFrameTimeMillis;
		private final ThreadedRendererWrapper mRendererWrapper;
		@@ -99,17 +102,17 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		private final Handler mHandler;
		private final ChoreographerWrapper mChoreographer;
		private final StatsLogWrapper mStatsLog;
		private final Object mLock = InteractionJankMonitor.getInstance().getLock();
		private final boolean mDeferMonitoring;
		private final FrameTrackerListener mListener;

		@VisibleForTesting
		public final boolean mSurfaceOnly;

		private SurfaceControl mSurfaceControl;
		private long mBeginVsyncId = INVALID_ID;
		private long mEndVsyncId = INVALID_ID;
		private boolean mMetricsFinalized;
		private boolean mCancelled = false;
		private FrameTrackerListener mListener;
		private boolean mTracingStarted = false;
		private Runnable mWaitForFinishTimedOut;

		@@ -142,16 +145,52 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		this.jankType = jankType;
		this.isFirstFrame = isFirstFrame;
		}

		@Override
		public String toString() {
		StringBuilder str = new StringBuilder();
		switch (jankType) {
		case JANK_NONE:
		str.append("JANK_NONE");
		break;
		case JANK_APP_DEADLINE_MISSED:
		str.append("JANK_APP_DEADLINE_MISSED");
		break;
		case JANK_SURFACEFLINGER_DEADLINE_MISSED:
		str.append("JANK_SURFACEFLINGER_DEADLINE_MISSED");
		break;
		case JANK_SURFACEFLINGER_GPU_DEADLINE_MISSED:
		str.append("JANK_SURFACEFLINGER_GPU_DEADLINE_MISSED");
		break;
		case DISPLAY_HAL:
		str.append("DISPLAY_HAL");
		break;
		case PREDICTION_ERROR:
		str.append("PREDICTION_ERROR");
		break;
		case SURFACE_FLINGER_SCHEDULING:
		str.append("SURFACE_FLINGER_SCHEDULING");
		break;
		default:
		str.append("UNKNOWN: ").append(jankType);
		break;
		}
		str.append(", ").append(frameVsyncId);
		str.append(", ").append(totalDurationNanos);
		return str.toString();
		}
		}

		public FrameTracker(@NonNull Session session, @NonNull Handler handler,
		@Nullable ThreadedRendererWrapper renderer, @Nullable ViewRootWrapper viewRootWrapper,
		public FrameTracker(@NonNull InteractionJankMonitor monitor, @NonNull Session session,
		@NonNull Handler handler, @Nullable ThreadedRendererWrapper renderer,
		@Nullable ViewRootWrapper viewRootWrapper,
		@NonNull SurfaceControlWrapper surfaceControlWrapper,
		@NonNull ChoreographerWrapper choreographer,
		@Nullable FrameMetricsWrapper metrics,
		@NonNull StatsLogWrapper statsLog,
		int traceThresholdMissedFrames, int traceThresholdFrameTimeMillis,
		@Nullable FrameTrackerListener listener, @NonNull Configuration config) {
		mMonitor = monitor;
		mSurfaceOnly = config.isSurfaceOnly();
		mSession = session;
		mHandler = handler;
		@@ -186,17 +225,15 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		mSurfaceChangedCallback = new ViewRootImpl.SurfaceChangedCallback() {
		@Override
		public void surfaceCreated(SurfaceControl.Transaction t) {
		synchronized (mLock) {
		getHandler().runWithScissors(() -> {
		if (mSurfaceControl == null) {
		mSurfaceControl = mViewRoot.getSurfaceControl();
		if (mBeginVsyncId != INVALID_ID) {
		mSurfaceControlWrapper.addJankStatsListener(
		FrameTracker.this, mSurfaceControl);
		markEvent("FT#deferMonitoring");
		postTraceStartMarker();
		}
		// Previous begin invocation is not successfully, begin it again.
		begin();
		}
		}
		}, EXECUTOR_TASK_TIMEOUT);
		}

		@Override
		@@ -208,8 +245,7 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener

		// Wait a while to give the system a chance for the remaining
		// frames to arrive, then force finish the session.
		mHandler.postDelayed(() -> {
		synchronized (mLock) {
		getHandler().postDelayed(() -> {
		if (DEBUG) {
		Log.d(TAG, "surfaceDestroyed: " + mSession.getName()
		+ ", finalized=" + mMetricsFinalized
		@@ -220,7 +256,6 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		end(REASON_END_SURFACE_DESTROYED);
		finish();
		}
		}
		}, 50);
		}
		};
		@@ -230,35 +265,42 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		}
		}

		@VisibleForTesting
		public Handler getHandler() {
		return mHandler;
		}

		/**
		* Begin a trace session of the CUJ.
		*/
		@UiThread
		public void begin() {
		synchronized (mLock) {
		final long currentVsync = mChoreographer.getVsyncId();
		// In normal case, we should begin at the next frame,
		// the id of the next frame is not simply increased by 1,
		// but we can exclude the current frame at least.
		if (mBeginVsyncId == INVALID_ID) {
		mBeginVsyncId = mDeferMonitoring ? currentVsync + 1 : currentVsync;
		}
		if (mSurfaceControl != null) {
		if (DEBUG) {
		Log.d(TAG, "begin: " + mSession.getName() + ", begin=" + mBeginVsyncId
		+ ", defer=" + mDeferMonitoring);
		+ ", defer=" + mDeferMonitoring + ", current=" + currentVsync);
		}
		if (mSurfaceControl != null) {
		if (mDeferMonitoring) {
		if (mDeferMonitoring && currentVsync < mBeginVsyncId) {
		markEvent("FT#deferMonitoring");
		// Normal case, we begin the instrument from the very beginning,
		// will exclude the first frame.
		postTraceStartMarker();
		postTraceStartMarker(this::beginInternal);
		} else {
		// If we don't begin the instrument from the very beginning,
		// there is no need to skip the frame where the begin invocation happens.
		beginInternal();
		}
		mSurfaceControlWrapper.addJankStatsListener(this, mSurfaceControl);
		}
		if (!mSurfaceOnly) {
		mRendererWrapper.addObserver(mObserver);
		} else {
		if (DEBUG) {
		Log.d(TAG, "begin: defer beginning since the surface is not ready for CUJ="
		+ mSession.getName());
		}
		}
		}
		@@ -267,27 +309,29 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		* Start trace section at appropriate time.
		*/
		@VisibleForTesting
		public void postTraceStartMarker() {
		mChoreographer.mChoreographer.postCallback(
		Choreographer.CALLBACK_INPUT, this::beginInternal, null);
		public void postTraceStartMarker(Runnable action) {
		mChoreographer.mChoreographer.postCallback(Choreographer.CALLBACK_INPUT, action, null);
		}

		@UiThread
		private void beginInternal() {
		synchronized (mLock) {
		if (mCancelled \|\| mEndVsyncId != INVALID_ID) {
		return;
		}
		mTracingStarted = true;
		markEvent("FT#begin");
		Trace.beginAsyncSection(mSession.getName(), (int) mBeginVsyncId);
		mSurfaceControlWrapper.addJankStatsListener(this, mSurfaceControl);
		if (!mSurfaceOnly) {
		mRendererWrapper.addObserver(mObserver);
		}
		}

		/**
		* End the trace session of the CUJ.
		*/
		@UiThread
		public boolean end(@Reasons int reason) {
		synchronized (mLock) {
		if (mCancelled \|\| mEndVsyncId != INVALID_ID) return false;
		mEndVsyncId = mChoreographer.getVsyncId();
		// Cancel the session if:
		@@ -314,24 +358,23 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		Log.e(TAG, "force finish cuj because of time out:" + mSession.getName());
		finish();
		};
		mHandler.postDelayed(mWaitForFinishTimedOut, TimeUnit.SECONDS.toMillis(10));
		getHandler().postDelayed(mWaitForFinishTimedOut, TimeUnit.SECONDS.toMillis(10));
		notifyCujEvent(ACTION_SESSION_END);
		return true;
		}
		}
		}

		/**
		* Cancel the trace session of the CUJ.
		*/
		@UiThread
		public boolean cancel(@Reasons int reason) {
		synchronized (mLock) {
		final boolean cancelFromEnd =
		reason == REASON_CANCEL_NOT_BEGUN \|\| reason == REASON_CANCEL_SAME_VSYNC;
		if (mCancelled \|\| (mEndVsyncId != INVALID_ID && !cancelFromEnd)) return false;
		mCancelled = true;
		markEvent("FT#cancel#" + reason);
		// We don't need to end the trace section if it never begun.
		// We don't need to end the trace section if it has never begun.
		if (mTracingStarted) {
		Trace.endAsyncSection(mSession.getName(), (int) mBeginVsyncId);
		}
		@@ -350,7 +393,6 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		notifyCujEvent(ACTION_SESSION_CANCEL);
		return true;
		}
		}

		private void markEvent(String desc) {
		Trace.beginSection(TextUtils.formatSimple("%s#%s", mSession.getName(), desc));
		@@ -364,8 +406,8 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener

		@Override
		public void onJankDataAvailable(SurfaceControl.JankData[] jankData) {
		synchronized (mLock) {
		if (mCancelled) {
		postCallback(() -> {
		if (mCancelled \|\| mMetricsFinalized) {
		return;
		}

		@@ -384,10 +426,19 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		}
		}
		processJankInfos();
		});
		}

		/**
		* For easier argument capture.
		*/
		@VisibleForTesting
		public void postCallback(Runnable callback) {
		getHandler().post(callback);
		}

		private @Nullable JankInfo findJankInfo(long frameVsyncId) {
		@Nullable
		private JankInfo findJankInfo(long frameVsyncId) {
		return mJankInfos.get((int) frameVsyncId);
		}

		@@ -400,8 +451,8 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener

		@Override
		public void onFrameMetricsAvailable(int dropCountSinceLastInvocation) {
		synchronized (mLock) {
		if (mCancelled) {
		postCallback(() -> {
		if (mCancelled \|\| mMetricsFinalized) {
		return;
		}

		@@ -426,9 +477,10 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		frameVsyncId, totalDurationNanos, isFirstFrame));
		}
		processJankInfos();
		}
		});
		}

		@UiThread
		private boolean hasReceivedCallbacksAfterEnd() {
		if (mEndVsyncId == INVALID_ID) {
		return false;
		@@ -451,6 +503,7 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		return false;
		}

		@UiThread
		private void processJankInfos() {
		if (mMetricsFinalized) {
		return;
		@@ -467,9 +520,12 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		: info.hwuiCallbackFired && info.surfaceControlCallbackFired;
		}

		@UiThread
		private void finish() {
		mHandler.removeCallbacks(mWaitForFinishTimedOut);
		getHandler().removeCallbacks(mWaitForFinishTimedOut);
		mWaitForFinishTimedOut = null;
		if (mMetricsFinalized \|\| mCancelled) return;
		markEvent("FT#finish#" + mJankInfos.size());
		mMetricsFinalized = true;

		// The tracing has been ended, remove the observer, see if need to trigger perfetto.
		@@ -496,7 +552,7 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		totalFramesCount++;
		boolean missedFrame = false;
		if ((info.jankType & JANK_APP_DEADLINE_MISSED) != 0) {
		Log.w(TAG, "Missed App frame:" + info.jankType);
		Log.w(TAG, "Missed App frame:" + info + ", CUJ=" + mSession.getName());
		missedAppFramesCount++;
		missedFrame = true;
		}
		@@ -505,7 +561,7 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		\|\| (info.jankType & JANK_SURFACEFLINGER_GPU_DEADLINE_MISSED) != 0
		\|\| (info.jankType & SURFACE_FLINGER_SCHEDULING) != 0
		\|\| (info.jankType & PREDICTION_ERROR) != 0) {
		Log.w(TAG, "Missed SF frame:" + info.jankType);
		Log.w(TAG, "Missed SF frame:" + info + ", CUJ=" + mSession.getName());
		missedSfFramesCount++;
		missedFrame = true;
		}
		@@ -520,13 +576,15 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		// TODO (b/174755489): Early latch currently gets fired way too often, so we have
		// to ignore it for now.
		if (!mSurfaceOnly && !info.hwuiCallbackFired) {
		Log.w(TAG, "Missing HWUI jank callback for vsyncId: " + info.frameVsyncId);
		Log.w(TAG, "Missing HWUI jank callback for vsyncId: " + info.frameVsyncId
		+ ", CUJ=" + mSession.getName());
		}
		}
		if (!mSurfaceOnly && info.hwuiCallbackFired) {
		maxFrameTimeNanos = Math.max(info.totalDurationNanos, maxFrameTimeNanos);
		if (!info.surfaceControlCallbackFired) {
		Log.w(TAG, "Missing SF jank callback for vsyncId: " + info.frameVsyncId);
		Log.w(TAG, "Missing SF jank callback for vsyncId: " + info.frameVsyncId
		+ ", CUJ=" + mSession.getName());
		}
		}
		}
		@@ -586,6 +644,7 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		* Remove all the registered listeners, observers and callbacks.
		*/
		@VisibleForTesting
		@UiThread
		public void removeObservers() {
		mSurfaceControlWrapper.removeJankStatsListener(this);
		if (!mSurfaceOnly) {
		@@ -601,7 +660,7 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		* Trigger the prefetto daemon.
		*/
		public void triggerPerfetto() {
		InteractionJankMonitor.getInstance().trigger(mSession);
		mMonitor.trigger(mSession);
		}

		/**
		@@ -666,10 +725,18 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
		mViewRoot = viewRoot;
		}

		/**
		* {@link ViewRootImpl#addSurfaceChangedCallback(ViewRootImpl.SurfaceChangedCallback)}
		* @param callback {@link ViewRootImpl.SurfaceChangedCallback}
		*/
		public void addSurfaceChangedCallback(ViewRootImpl.SurfaceChangedCallback callback) {
		mViewRoot.addSurfaceChangedCallback(callback);
		}

		/**
		* {@link ViewRootImpl#removeSurfaceChangedCallback(ViewRootImpl.SurfaceChangedCallback)}
		* @param callback {@link ViewRootImpl.SurfaceChangedCallback}
		*/
		public void removeSurfaceChangedCallback(ViewRootImpl.SurfaceChangedCallback callback) {
		mViewRoot.removeSurfaceChangedCallback(callback);
		}

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

+153 −83

File changed.

Preview size limit exceeded, changes collapsed.