Resolve merge conflicts for BubbleLoggerImpl (c472d693) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/bubbles/BubbleLoggerImpl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ public class BubbleLoggerImpl extends UiEventLoggerImpl implements BubbleLogger
		* @param e UI event
		*/
		public void log(Bubble b, UiEventEnum e) {
		super.log(e, b.getUser().getIdentifier(), b.getPackageName());
		logWithInstanceId(e, b.getAppUid(), b.getPackageName(), b.getInstanceId());
		}

		/**