commit 63543e299764ac5a904dadd8b45e9ce301ea1023
author Adam Powell <adamp@google.com> Sun Aug 28 16:58:27 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun Aug 28 16:58:27 2011 -0700
tree f591263734f3f581c0baf5745bd7822f2bc6c3a6
parent 816879f2d57a22394816b5a405f9e15e6ac56b3b
parent 67ed6c7224b902ae56a109701a241210e18cf721

Merge "Fix bug 5133509 - Align holo menu panel windows along the bottom of the screen"

media/libstagefright/SurfaceMediaSource.cpp

diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp
index c2e6707..91b81c2 100644
--- a/media/libstagefright/SurfaceMediaSource.cpp
+++ b/media/libstagefright/SurfaceMediaSource.cpp
@@ -179,9 +179,11 @@
     // TODO: Currently just uses mDefaultWidth/Height. In the future
     // we might declare mHeight and mWidth and check against those here.
     if ((w != 0) || (h != 0)) {
-        LOGE("dequeuebuffer: invalid buffer size! Req: %dx%d, Found: %dx%d",
-                mDefaultWidth, mDefaultHeight, w, h);
-        return BAD_VALUE;
+        if ((w != mDefaultWidth) || (h != mDefaultHeight)) {
+            LOGE("dequeuebuffer: invalid buffer size! Req: %dx%d, Found: %dx%d",
+                    mDefaultWidth, mDefaultHeight, w, h);
+            return BAD_VALUE;
+        }
     }
 
     status_t returnFlags(OK);

policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java

diff --git a/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java b/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
index ee0a6e9..ce3bc74 100644
--- a/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
+++ b/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
@@ -165,7 +165,7 @@
         View switchImeButton = findViewById(R.id.switch_ime_button);
         final InputMethodManager imm = (InputMethodManager) getContext().getSystemService(
                 Context.INPUT_METHOD_SERVICE);
-        if (switchImeButton != null && hasMultipleEnabledIMEsOrSubtypes(imm, false)) {
+        if (mIsAlpha && switchImeButton != null && hasMultipleEnabledIMEsOrSubtypes(imm, false)) {
             switchImeButton.setVisibility(View.VISIBLE);
             switchImeButton.setOnClickListener(new OnClickListener() {
                 public void onClick(View v) {