Merge "Eat copy pasta." into jb-mr1-dev

Jeff Brown · Android (Google) Code Review · commit 44015010acef · 2012-09-13T19:26:46.000-07:00
diff --git a/services/java/com/android/server/display/DisplayDeviceInfo.java b/services/java/com/android/server/display/DisplayDeviceInfo.java
@@ -180,7 +180,7 @@ private static String flagsToString(int flags) {
             msg.append(", FLAG_DEFAULT_DISPLAY");
         }
         if ((flags & FLAG_SUPPORTS_ROTATION) != 0) {
-            msg.append(", FLAG_DEFAULT_DISPLAY");
+            msg.append(", FLAG_SUPPORTS_ROTATION");
         }
         if ((flags & FLAG_SUPPORTS_SECURE_VIDEO_OUTPUT) != 0) {
             msg.append(", FLAG_SUPPORTS_SECURE_VIDEO_OUTPUT");

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ private static String flagsToString(int flags) {`
`180`	`180`	`msg.append(", FLAG_DEFAULT_DISPLAY");`
`181`	`181`	`}`
`182`	`182`	`if ((flags & FLAG_SUPPORTS_ROTATION) != 0) {`
`183`		`- msg.append(", FLAG_DEFAULT_DISPLAY");`
	`183`	`+ msg.append(", FLAG_SUPPORTS_ROTATION");`
`184`	`184`	`}`
`185`	`185`	`if ((flags & FLAG_SUPPORTS_SECURE_VIDEO_OUTPUT) != 0) {`
`186`	`186`	`msg.append(", FLAG_SUPPORTS_SECURE_VIDEO_OUTPUT");`