Merge "stagefright: allow secure audio input buffer"

media/libstagefright/ACodec.cpp

@@ -1866,16 +1866,15 @@ status_t ACodec::configureCodec(
             mFlags |= kFlagIsGrallocUsageProtected;
             mFlags |= kFlagPushBlankBuffersToNativeWindowOnShutdown;
         }
+    }
+    if (mFlags & kFlagIsSecure) {
+        // use native_handles for secure input buffers
+        err = setPortMode(kPortIndexInput, IOMX::kPortModePresetSecureBuffer);
 
-        if (mFlags & kFlagIsSecure) {
+        if (err != OK) {
-            // use native_handles for secure input buffers
+            ALOGI("falling back to non-native_handles");
-            err = setPortMode(kPortIndexInput, IOMX::kPortModePresetSecureBuffer);
+            setPortMode(kPortIndexInput, IOMX::kPortModePresetByteBuffer);
-
+            err = OK; // ignore error for now
-            if (err != OK) {
-                ALOGI("falling back to non-native_handles");
-                setPortMode(kPortIndexInput, IOMX::kPortModePresetByteBuffer);
-                err = OK; // ignore error for now
-            }
         }
     }
     if (haveNativeWindow) {