  // static
  uint32_t OMXCodec::getComponentQuirks(
          const MediaCodecList *list, size_t index) {
-@@ -359,6 +439,12 @@ uint32_t OMXCodec::getComponentQuirks(
+@@ -359,6 +373,12 @@ uint32_t OMXCodec::getComponentQuirks(
                  index, "requires-loaded-to-idle-after-allocation")) {
          quirks |= kRequiresLoadedToIdleAfterAllocation;
      }

 #ifdef TEE_SINK
                                   , teeSink
 #endif
@@ -2123,6 +2210,12 @@ audio_io_handle_t AudioFlinger::openInput(audio_module_handle_t module,
         if (pFormat != NULL) *pFormat = config.format;
         if (pChannelMask != NULL) *pChannelMask = reqChannels;
 

         remote()->transact(OPEN_INPUT, data, &reply);
         audio_io_handle_t input = (audio_io_handle_t) reply.readInt32();
         devices = (audio_devices_t)reply.readInt32();
@@ -514,7 +549,11 @@ public:
         return input;
     }
 
