Automerger Merge Worker
f325ac3641
Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b am: f0f5475c88 am: 4c86f2b479 am: ade337d712
...
Change-Id: Id7a159c669278b643ddc2362f8e4813248db378c
2020-03-14 01:13:27 +00:00
Automerger Merge Worker
ade337d712
Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b am: f0f5475c88 am: 4c86f2b479
...
Change-Id: Ia863ad9d0e88efc8fcd5eb2d01c3768cf6a0cea8
2020-03-14 00:55:23 +00:00
Automerger Merge Worker
4c86f2b479
Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b am: f0f5475c88
...
Change-Id: I884d7923dbc4a6cc469c1b231957d98f0770a854
2020-03-14 00:36:11 +00:00
Automerger Merge Worker
f594ed4bb6
Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 am: 20274578e5 am: 761ec158ba am: ed6a0464ce am: f0264fe3a7
...
Change-Id: I9c468ea5634d4f86f1d8d46670e0cfe6522ed7d3
2020-03-14 00:26:20 +00:00
Automerger Merge Worker
1f0f3b07f0
Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 am: 3f479621da am: 9b6135f2d8 am: 912dfb8a58
...
Change-Id: I0d47cf58e21da64a4366d0172877d2c8984ba54d
2020-03-14 00:26:10 +00:00
Automerger Merge Worker
f0264fe3a7
Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 am: 20274578e5 am: 761ec158ba am: ed6a0464ce
...
Change-Id: Ic3a3d05dfad53a00b13a34a4adfe9dc07e3998dc
2020-03-14 00:25:55 +00:00
Automerger Merge Worker
722b71e5a2
Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 am: 20274578e5 am: 4d84d367da am: 24c583afb5
...
Change-Id: I491162ae5ae82ff1df0865affcbb556c65f39546
2020-03-14 00:25:55 +00:00
Automerger Merge Worker
f0f5475c88
Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b
...
Change-Id: I56fc4535268bd2da1210ac23848c652ac099e97b
2020-03-14 00:18:37 +00:00
Automerger Merge Worker
ed6a0464ce
Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 am: 20274578e5 am: 761ec158ba
...
Change-Id: Idcd925eea8400bcf0e1b7b602b42e5934be2576c
2020-03-14 00:07:07 +00:00
Automerger Merge Worker
912dfb8a58
Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 am: 3f479621da am: 9b6135f2d8
...
Change-Id: I110cb167ed74da02447aac1d4221ede8828dfe46
2020-03-14 00:06:53 +00:00
Automerger Merge Worker
24c583afb5
Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 am: 20274578e5 am: 4d84d367da
...
Change-Id: I628aeac6a8df81ef5064f55419612b8351e6c523
2020-03-14 00:06:41 +00:00
Edwin Wong
53f52cef0b
Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev
2020-03-14 00:01:36 +00:00
Automerger Merge Worker
9b6135f2d8
Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 am: 3f479621da
...
Change-Id: Ib958081c52a276dd524b1014f60093a77f6f66e5
2020-03-13 23:56:27 +00:00
Automerger Merge Worker
761ec158ba
Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 am: 20274578e5
...
Change-Id: Id0caee95588eaf89b221b2c04a427f3d7207ed39
2020-03-13 23:56:18 +00:00
Automerger Merge Worker
4d84d367da
Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 am: 20274578e5
...
Change-Id: Ied36eb673947d3ab35a2abb4eccb4812ef948efe
2020-03-13 23:56:18 +00:00
Automerger Merge Worker
3f479621da
Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1
...
Change-Id: If416900f9bf30a9c71adb14dd71711805b19dc0e
2020-03-13 23:42:25 +00:00
Automerger Merge Worker
20274578e5
Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1
...
Change-Id: I01c572c301744baff41eb3b9b581b1853a8e4736
2020-03-13 23:42:17 +00:00
Rahul Frias
587f488ac1
Merge "Disable delayed termination on unprovisioning" into rvc-dev
2020-03-13 23:26:45 +00:00
Automerger Merge Worker
8cdbf15914
ODK: Address review comments am: 5a6a2075f5 am: f131f8d261 am: 408307d51a am: 2522b08b41 am: 0afb13f2fd
...
Change-Id: Ie090c4343c643d8518501b1d05f9e3bc9bed03b0
2020-03-13 22:18:53 +00:00
Automerger Merge Worker
7e64e4871f
ODK: Address review comments am: 5a6a2075f5 am: da9e54342a am: c89e450f8b am: dbc5ae0a95
...
Change-Id: I219dc3507167ea77c9be8a64f3ffbe815119ee15
2020-03-13 22:18:05 +00:00
Automerger Merge Worker
7a82aaa196
ODK: Address review comments am: 5a6a2075f5 am: f131f8d261 am: 0b9321b0b1 am: 6ea9fe5514
...
Change-Id: I74374e5f600603aedb7e45e19be26f79a5ce3233
2020-03-13 22:17:25 +00:00
Automerger Merge Worker
0afb13f2fd
ODK: Address review comments am: 5a6a2075f5 am: f131f8d261 am: 408307d51a am: 2522b08b41
...
Change-Id: I627d75d69c6c4f0f6b8c7f4e2210f847f718bc27
2020-03-13 22:16:56 +00:00
Automerger Merge Worker
dbc5ae0a95
ODK: Address review comments am: 5a6a2075f5 am: da9e54342a am: c89e450f8b
...
Change-Id: I4b4f3716d3d8c6c3a59075eccf99961520fa3b22
2020-03-13 21:57:34 +00:00
Automerger Merge Worker
6ea9fe5514
ODK: Address review comments am: 5a6a2075f5 am: f131f8d261 am: 0b9321b0b1
...
Change-Id: If732fdecf8c3cebff08809fd3e1170ce22623b11
2020-03-13 21:57:09 +00:00
Automerger Merge Worker
2522b08b41
ODK: Address review comments am: 5a6a2075f5 am: f131f8d261 am: 408307d51a
...
Change-Id: Ic80599ac5684709ad0dd97bfaaaec39fb3b8933c
2020-03-13 21:57:00 +00:00
Automerger Merge Worker
408307d51a
ODK: Address review comments am: 5a6a2075f5 am: f131f8d261
...
Change-Id: I58a53762206fb70212a3b06f04b405bf18a57f18
2020-03-13 21:43:08 +00:00
Automerger Merge Worker
c89e450f8b
ODK: Address review comments am: 5a6a2075f5 am: da9e54342a
...
Change-Id: I5c4c6dab960b4f7848890e6dbeaf047cc38b11cf
2020-03-13 21:43:05 +00:00
Automerger Merge Worker
0b9321b0b1
ODK: Address review comments am: 5a6a2075f5 am: f131f8d261
...
Change-Id: I85b1887098cd28857f39d47bfc7a789cbab34ac4
2020-03-13 21:42:50 +00:00
Automerger Merge Worker
da9e54342a
ODK: Address review comments am: 5a6a2075f5
...
Change-Id: Iee171a63c04244553f5c9dfb4b0efcc05e660c48
2020-03-13 21:21:09 +00:00
Automerger Merge Worker
f131f8d261
ODK: Address review comments am: 5a6a2075f5
...
Change-Id: I8fe39a7de598510871f870b242f4073f3e333c12
2020-03-13 21:21:03 +00:00
Edwin Wong
a66d2b392e
Clear sessionId regardless of what closeSession returns
...
After succeeding openSessionCommon(), when the call to
getSecurityLevel() fails, the code calls closeSession()
and only clears the sessionId if closeSession() fails.
We should always clear sessionId in this case.
Also, make it clearer that the status returned by
getSecurityLevel() does not overwrite the value from
openSessionCommon().
Merged from http://go/wvgerrit/95845
Test: unit test
adb shell LD_LIBRARY_PATH="/vendor/lib64" /data/nativetest/libwvdrmdrmplugin_hidl_test
Bug: 151364587
Change-Id: I3a9106ffa44c654d3e072a0b0597398d410fc84f
2020-03-13 11:40:20 -07:00
Cong Lin
5a6a2075f5
ODK: Address review comments
...
Merge of http://go/wvgerrit/95666
Mostly fixing coding styles and a few vulnerability check.
Updating tests according to the fix.
Bug: 150614088
Bug: 150881959
Test: Ran cdm and odk unit tests
Change-Id: I109a96ee8ded089d59ab49c2f94b6833c932fd1e
2020-03-12 18:25:46 -07:00
Automerger Merge Worker
34f1aaea80
Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: a352d99c43 am: 34ded343ec am: 6f570f5df6 am: 9a301e07b7
...
Change-Id: Ie6bd49dbdea813799eede53fb59d0dc4355abf6a
2020-03-13 00:31:13 +00:00
Automerger Merge Worker
9a301e07b7
Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: a352d99c43 am: 34ded343ec am: 6f570f5df6
...
Change-Id: Ie199b8d5c20c57d53585409c1da8717a20a8ecdc
2020-03-13 00:11:39 +00:00
Automerger Merge Worker
d2a4bb59b5
Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: 4f0f2a90ec am: 342417860c am: 00dc188136
...
Change-Id: I78f0ed8aec7ca111b2e39a67bf9541a460cd9b34
2020-03-13 00:00:58 +00:00
Automerger Merge Worker
6d3a128df4
Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: a352d99c43 am: 3550602f92 am: 60b927dca0
...
Change-Id: I0556034b8c3ed654e0a42d8ec29abbfc0b0fbfd7
2020-03-12 23:59:32 +00:00
Automerger Merge Worker
00dc188136
Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: 4f0f2a90ec am: 342417860c
...
Change-Id: Iceb71fd410a8fe1790512527435f5a1b77cfd274
2020-03-12 23:59:06 +00:00
Automerger Merge Worker
6f570f5df6
Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: a352d99c43 am: 34ded343ec
...
Change-Id: I16a81b714dd9c4552b60a31af8b152859d2b6ecb
2020-03-12 23:59:05 +00:00
Automerger Merge Worker
60b927dca0
Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: a352d99c43 am: 3550602f92
...
Change-Id: I0d6d8c3f65d6fa3143bb28d58c9c170cdedea13d
2020-03-12 23:58:53 +00:00
Automerger Merge Worker
396e8f488a
Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: ea491da7fc am: 24e95938dc am: 2052cdf1a9 am: 781c9537b0
...
Change-Id: Ib3bb0ce5922894bf003a55063b997cb96ba52028
2020-03-12 23:40:37 +00:00
Automerger Merge Worker
34ded343ec
Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: a352d99c43
...
Change-Id: Idd2f7cb1a808bf517ef5e0cadc2107c493450835
2020-03-12 23:40:05 +00:00
Automerger Merge Worker
342417860c
Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: 4f0f2a90ec
...
Change-Id: Ia51ff1e08302c45aa29328029c5d1e5af387760e
2020-03-12 23:39:58 +00:00
Automerger Merge Worker
3550602f92
Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: a352d99c43
...
Change-Id: Icdb8c31d2fc29d59c16abf6973bf46feb9a62914
2020-03-12 23:39:48 +00:00
Automerger Merge Worker
4f0f2a90ec
Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9
...
Change-Id: Idb2ae8f90efd0639ac4e6e5f36e5e976e8a6033e
2020-03-12 23:20:22 +00:00
Automerger Merge Worker
a352d99c43
Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9
...
Change-Id: I8930bafb6c2e3b64508098a60f26f70ab181720e
2020-03-12 23:20:14 +00:00
Edwin Wong
fae5d3f7a9
Merge "openSession_1_1 should return error for wrong security level" into rvc-dev
2020-03-12 23:06:33 +00:00
Rahul Frias
89d19be766
Disable delayed termination on unprovisioning
...
[ Merge of http://go/wvgerrit/95784 ]
On unprovisioning, all persistent state/files are deleted. If a
provisioning session is opened soon after, |OEMCrypto_Terminate|
and |OEMCrypto_Initialize| will not be called. The (deleted) device
key will remain resident in memory and will not be regenerated until
|OEMCrypto_Initialize| is called. Any L3 licenses created will be
associated with a device key that does not exist, at least after
OEMCrypto is terminated.
By disabling delayed termination of OEMCrypto, OEMCrypto will be
terminated and initialized immediately on unprovisioning.
Bug: 149808504
Test: WV unit/integration tests on L3
Change-Id: Id3fbce621b47a723ff624cf45f1ac203421a8dba
2020-03-12 15:58:33 -07:00
Automerger Merge Worker
781c9537b0
Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: ea491da7fc am: 24e95938dc am: 2052cdf1a9
...
Change-Id: I8c7bdafee8a89f2771b19be38546aeb85d51698f
2020-03-12 22:21:32 +00:00
Automerger Merge Worker
ac596cd0c2
Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: 77aeff11fc am: f9e7986e2d am: ba0952dfe4
...
Change-Id: If74f26f8b7ce90a4fbea4a09c24c8decc7ee0702
2020-03-12 22:12:22 +00:00
Automerger Merge Worker
1449be9a8d
Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: ea491da7fc am: 567e26b25c am: d06bb307b5
...
Change-Id: Ifb59852b74a416a21a4ddfaa29a1b8d5e740436d
2020-03-12 22:11:24 +00:00
