diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-16 13:01:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-16 13:01:38 -0700 |
| commit | f97ed771979162c4a2a75959c57fb793438a3a8b (patch) | |
| tree | 7cfd542b6ab2730e26f3e4fee51548cf441af311 /media | |
| parent | b107f4dec334b4c54584d4af21a7ceefc14947f2 (diff) | |
| parent | d90a2c4d4463085155444efb07eba2d6579b444a (diff) | |
| download | frameworks_base-f97ed771979162c4a2a75959c57fb793438a3a8b.zip frameworks_base-f97ed771979162c4a2a75959c57fb793438a3a8b.tar.gz frameworks_base-f97ed771979162c4a2a75959c57fb793438a3a8b.tar.bz2 | |
am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
* commit 'd90a2c4d4463085155444efb07eba2d6579b444a':
DO NOT MERGE. Integrate from master: Rework display size access.
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; |