commit 33327c7f0f04bcce3f8e8ee23953f87efc423037
author Jeff Tinker <jtinker@google.com> Wed Mar 15 23:41:23 2017 -0700
committer Jeff Tinker <jtinker@google.com> Fri Mar 17 11:33:24 2017 -0700
tree 2e3f8e0de5d2ad4a8d5e87c5ffa1d770e2041c49
parent d0cb831e7f14c43359aeb080d9564185d28c7a75

Fix decoder instantiation during playback

When a decoder is created while another decoder
is in use and the two decoders share a common
crypto instance, decryption results would become
indeterminate, which could cause the decoder to
hang. This change adds a notification to the
crypto instance so it can update state when its
ownership changes.

bug: 36209723

Test: playbacktests-debug-androidTest.apk as
described in the bug.

Change-Id: I453c260eace5543dd79a3569bf6a9592394c4113

media/libmedia/include/CryptoHal.h

diff --git a/media/libmedia/include/CryptoHal.h b/media/libmedia/include/CryptoHal.h
index 28ade20..d6214c2 100644
--- a/media/libmedia/include/CryptoHal.h
+++ b/media/libmedia/include/CryptoHal.h
@@ -60,6 +60,9 @@
             const ICrypto::DestinationBuffer &destination,
             AString *errorDetailMsg);
 
+    virtual void setHeap(const sp<IMemoryHeap>& heap) { setHeapBase(heap); }
+    virtual void unsetHeap(const sp<IMemoryHeap>& heap) { clearHeapBase(heap); }
+
 private:
     mutable Mutex mLock;
 
@@ -82,6 +85,7 @@
             const uint8_t uuid[16], const void *initData, size_t size);
 
     void setHeapBase(const sp<IMemoryHeap>& heap);
+    void clearHeapBase(const sp<IMemoryHeap>& heap);
 
     status_t toSharedBuffer(const sp<IMemory>& memory, ::SharedBuffer* buffer);