widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,777 Commits 2 Branches 0 Tags
2b39f18160d50c952ad911b544c34947b629003a
Commit Graph

3777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
26ad845be5 Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38 am: 6688149e76 am: 1914295162 am: 6c5edffe37 
Change-Id: I695343682fb8a9e71008757e3a1e3874cad384fb
 2020-03-14 02:05:37 +00:00
Automerger Merge Worker
06b8684d6e Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38 am: 58a6b37d02 am: 702b04b7f4 
Change-Id: I6a41a9b3920a08b48cd02946187fe7ee59b9fef2
 2020-03-14 01:48:18 +00:00
Automerger Merge Worker
6c5edffe37 Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38 am: 6688149e76 am: 1914295162 
Change-Id: Ibfb926545393068c33499dab89e4b65a3d29aa80
 2020-03-14 01:48:15 +00:00
Automerger Merge Worker
075908ec92 Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38 am: 6688149e76 am: 23a2560f9e 
Change-Id: Ifd6969b9be47df165b60df5ac87bc49df6288670
 2020-03-14 01:48:13 +00:00
Automerger Merge Worker
1914295162 Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38 am: 6688149e76 
Change-Id: Icfb68f3c6c918d823b66609f0c4bc2f3c12a1b23
 2020-03-14 01:34:38 +00:00
Automerger Merge Worker
702b04b7f4 Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38 am: 58a6b37d02 
Change-Id: I2998bea5a3abfa5184c5b4aeef74a1bb40158983
 2020-03-14 01:34:37 +00:00
Automerger Merge Worker
23a2560f9e Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38 am: 6688149e76 
Change-Id: I43075679256f54c496cd30cddf22acdd96798e14
 2020-03-14 01:34:13 +00:00
Automerger Merge Worker
6688149e76 Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38 
Change-Id: I6db35ab5adec9bed3f16424871153ec8265f430d
 2020-03-14 01:13:45 +00:00
Automerger Merge Worker
58a6b37d02 Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38 
Change-Id: I34eb3b444b7978696e6650aae4e6270dd4bf9d7c
 2020-03-14 01:13:36 +00:00
Automerger Merge Worker
b6ca302980 Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b am: f0f5475c88 am: e5549a8fe4 am: f1ebea0cff 
Change-Id: Iac27a20eaa6c651b72ba2b1f321e5e2993b492d3
 2020-03-14 01:13:18 +00:00
Automerger Merge Worker
f1ebea0cff Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b am: f0f5475c88 am: e5549a8fe4 
Change-Id: I98dae44e84ecbae064729f73bed7f49118477879
 2020-03-14 00:55:44 +00:00
Automerger Merge Worker
60fdc23eb1 Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b am: 1324af2899 am: 0e2846d1e9 
Change-Id: I987df2b36552e92d4d3188bd8a01078a134e3d15
 2020-03-14 00:55:31 +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
Cong Lin
7461d0bc38 Merge "Remove the access to net.hostname" into rvc-dev 2020-03-14 00:55:08 +00:00
Automerger Merge Worker
0e2846d1e9 Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b am: 1324af2899 
Change-Id: I7ad4eb9027b33916f50ab25f4f02ca3ffa8fc126
 2020-03-14 00:36:27 +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
e5549a8fe4 Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b am: f0f5475c88 
Change-Id: Ib14fbac2d7f89189fc37a9778143f9a3a81cf998
 2020-03-14 00:36:09 +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
1324af2899 Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b 
Change-Id: I1cdb120c57b236ee7c9c18422b5d5803cada4606
 2020-03-14 00:18:45 +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
Fred Gylys-Colwell
80d93c31f9 Use production provisioning server for unit tests 
Merge from Widevine repo of http://go/wvgerrit/95848

The production provisioning server supports v16 now. Time to go back
home.

Bug: 149720416
Test: unit tests w/v16 mod mock
Change-Id: Ie67165d7e30dd22c54a08626d50346c4aa57cb72
 2020-03-13 16:37:23 -07:00
Rahul Frias
587f488ac1 Merge "Disable delayed termination on unprovisioning" into rvc-dev 2020-03-13 23:26:45 +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
Cong Lin
a9889aafd7 Remove the access to net.hostname 
Merge of http://go/wvgerrit/95723

This is to remove the reference to net.hostname in
get_unique_id_android.cpp for L3. Keep ro.serialno, and just change the
net.hostname call to setting the constant string.

Bug: 130028203
Test: Ran unit tests
Change-Id: I90d955c117924c16c71f145dea53fe32644d2875
 2020-03-13 14:12:09 -07: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
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
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
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