diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-16 12:54:22 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-16 12:54:22 -0700 |
| commit | 1e662c3294b740ff694ad98e4d9a366e1e4b5e62 (patch) | |
| tree | 135d285dcb1f27f18a6267ebb481325d39899d00 /media | |
| parent | 15afd076d6070374cbb4f9dcbe28dda67caa0718 (diff) | |
| parent | ac8dea12c17aa047e03a358110aeb60401d36aa2 (diff) | |
| download | frameworks_base-1e662c3294b740ff694ad98e4d9a366e1e4b5e62.zip frameworks_base-1e662c3294b740ff694ad98e4d9a366e1e4b5e62.tar.gz frameworks_base-1e662c3294b740ff694ad98e4d9a366e1e4b5e62.tar.bz2 | |
Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/mtp/MtpDatabase.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/mtp/MtpDatabase.java b/media/java/android/mtp/MtpDatabase.java index b900671..c9e0f6f 100644 --- a/media/java/android/mtp/MtpDatabase.java +++ b/media/java/android/mtp/MtpDatabase.java @@ -616,8 +616,8 @@ public class MtpDatabase { // use screen size as max image size Display display = ((WindowManager)mContext.getSystemService( Context.WINDOW_SERVICE)).getDefaultDisplay(); - int width = display.getWidth(); - int height = display.getHeight(); + int width = display.getMaximumSizeDimension(); + int height = display.getMaximumSizeDimension(); String imageSize = Integer.toString(width) + "x" + Integer.toString(height); imageSize.getChars(0, imageSize.length(), outStringValue, 0); outStringValue[imageSize.length()] = 0; |