Merge "Improve logging for origin return filters/transitions" into main (c5977945) · Commits · e / os / android_frameworks_base

packages/SystemUI/animation/lib/src/com/android/systemui/animation/OriginTransitionSession.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -117,6 +117,7 @@ public class OriginTransitionSession {
	filters.add(entry.getValue());		filters.add(entry.getValue());
	logD("mapping exit transition[" + index + "]: "		logD("mapping exit transition[" + index + "]: "
	+ entry.getKey() + " and filter: " + entry.getValue());		+ entry.getKey() + " and filter: " + entry.getValue());
			index++;
	}		}
	remoteTransition =		remoteTransition =
	mOriginTransition =		mOriginTransition =

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -313,7 +313,7 @@ public class IOriginTransitionsImpl extends IOriginTransitions.Stub {
	}		}
	mShellTransitions.registerRemote(filter, t);		mShellTransitions.registerRemote(filter, t);
	} else {		} else {
	Log.w(TAG, "Failed to update default filter for transition info");		Log.w(TAG, "Failed to update default filter:" + filter);
	}		}
	TransitionFilter takeoverFilter =		TransitionFilter takeoverFilter =
	createReturnTransitionFilter(/* forTakeover= */ true);		createReturnTransitionFilter(/* forTakeover= */ true);
	@@ -325,7 +325,7 @@ public class IOriginTransitionsImpl extends IOriginTransitions.Stub {
	mShellTransitions.registerRemoteForTakeover(		mShellTransitions.registerRemoteForTakeover(
	takeoverFilter, t);		takeoverFilter, t);
	} else {		} else {
	Log.w(TAG, "Failed to update takeover filter for transition info");		Log.w(TAG, "Failed to update takeover filter: " + takeoverFilter);
	}		}
	} else {		} else {
	// take the provided filters and update them with the required info		// take the provided filters and update them with the required info
	@@ -340,7 +340,7 @@ public class IOriginTransitionsImpl extends IOriginTransitions.Stub {
	mShellTransitions.registerRemote(updatedFilter, t);		mShellTransitions.registerRemote(updatedFilter, t);
	}		}
	} else {		} else {
	Log.w(TAG, "Failed to update provided filter for transition info");		Log.w(TAG, "Failed to update provided filter: " + f);
	}		}
	}		}
	}		}