summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2013-10-07 22:21:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-07 22:21:52 +0000
commitc2d6e51d6c27eb8f3ca917b467e4a6d55d10cdc8 (patch)
tree65731c4df1d73a97502629e2f82a560dc4a08dff /core/java/android
parentc37a5ab54e5e3ad3bb816d7c9e2b923af6f74f73 (diff)
parentb2420c917bf4092f44a2270d7e88ee2380f72080 (diff)
downloadframeworks_base-c2d6e51d6c27eb8f3ca917b467e4a6d55d10cdc8.zip
frameworks_base-c2d6e51d6c27eb8f3ca917b467e4a6d55d10cdc8.tar.gz
frameworks_base-c2d6e51d6c27eb8f3ca917b467e4a6d55d10cdc8.tar.bz2
Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/print/PrintAttributes.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/print/PrintAttributes.java b/core/java/android/print/PrintAttributes.java
index ec979b3..e1a9cb7 100644
--- a/core/java/android/print/PrintAttributes.java
+++ b/core/java/android/print/PrintAttributes.java
@@ -282,7 +282,7 @@ public final class PrintAttributes implements Parcelable {
*/
public static final MediaSize UNKNOWN_PORTRAIT =
new MediaSize("UNKNOWN_PORTRAIT", "android",
- R.string.mediasize_unknown_portrait, Integer.MAX_VALUE, 1);
+ R.string.mediasize_unknown_portrait, 1, Integer.MAX_VALUE);
/**
* Unknown media size in landscape mode.
@@ -293,7 +293,7 @@ public final class PrintAttributes implements Parcelable {
*/
public static final MediaSize UNKNOWN_LANDSCAPE =
new MediaSize("UNKNOWN_LANDSCAPE", "android",
- R.string.mediasize_unknown_landscape, 1, Integer.MAX_VALUE);
+ R.string.mediasize_unknown_landscape, Integer.MAX_VALUE, 1);
// ISO sizes