[RESTRICT AUTOMERGE] Fix L3 clock loading issue

Browse Source

This is a manual merge of ag/14930112 to address an auto merge conflict.

Changes in the obfuscated L3 library:

L3 loads clock info from an encrypted file during initialization. There
is a bug which calls the clock loading function before the decryption
key gets intialized in InitializeEngine(). Clock will be loaded with bad
decrypted data, which caused playback failure after system reboot.

The fix is to move clock loading after InitializeEngine() to ensure
decryption key is ready.

Bug: 191988567
Test: L3 unit tests;
Test: Manual playback tests on Netflix
      Download, play, reboot device, play again
Test: GTS tests https://android-build.googleplex.com/builds/tests/view?invocationId=I02800009363823424&testResultId=TR23225132004211909&redirect=http://sponge2/73efa8e8-951a-48bb-b2a9-0b09d5038ed3
Change-Id: I947775dc05eb000f1860a889510927861e1d169c

...

This commit is contained in:

Cong Lin

2021-06-25 18:46:21 +00:00

parent 8e8cbfac39

commit e98c9150df

4 changed files with 288098 additions and 288110 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

151512

libwvdrmengine/level3/arm/libl3oemcrypto.cpp

File diff suppressed because it is too large Load Diff

150524

libwvdrmengine/level3/arm64/libl3oemcrypto.cpp

File diff suppressed because it is too large Load Diff

140633

libwvdrmengine/level3/x86/libl3oemcrypto.cpp

File diff suppressed because it is too large Load Diff

133539

libwvdrmengine/level3/x86_64/libl3oemcrypto.cpp

File diff suppressed because it is too large Load Diff