)]}' { "log": [ { "commit": "c2320223222fe4507b6d67f6b8b4001d26c77a9c", "tree": "874d89b68934c19a559f6d6b3ddaff3f44fcaa02", "parents": [ "ca61a8f0bc22606cb11b99bdb10a146f941d556e" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 04 15:02:19 2014 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 04 15:02:19 2014 -0700" }, "message": "Fix build break in mock drm plugin build\n\nChange-Id: I8ae5d378df694360be3d76e06512e2ebc9fc0572\n" }, { "commit": "68b15554f6dca3b056eac517fe5fa2fd4ee80a33", "tree": "d6842666f3d062427b56f27c0b9e6e09976389a5", "parents": [ "fdefe34f40ea6c8964677eaa9107958b0bdf76d0" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Apr 30 10:19:03 2014 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Aug 01 17:16:16 2014 +0000" }, "message": "Allow device to be unprovisioned\n\nbug: 12247651\nChange-Id: I564ac8de3da2430342a028f4058e2c5ac2d85d5e\n" }, { "commit": "4ebf92c0418584f1bb5ab3e83e8398351f4c05e5", "tree": "b4334f0cebcc481eee446cb041107aba7af9da7d", "parents": [ "62922fd0e6186dd5f53fe6406df10468e80dfb47" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Jul 01 10:32:59 2014 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Jul 01 11:08:38 2014 -0700" }, "message": "Create a single test binary.\n\nTo run individual test suite, follow the example shown below:\nadb shell LD_LIBRARY_PATH\u003d/system/vendor/lib/mediadrm /system/bin/ClearKeyDrmUnitTest\n--gtest_filter\u003dJsonWebKeyTest.*\n\nChange-Id: I8ecc944a734cde351505a7cd8c3997976d74553b\n" }, { "commit": "2421a4ba309f082a83be9b8e385c00cd8e0043f6", "tree": "ef335b48b2340c17f880a79e98cf273103b4c39d", "parents": [ "8d0bc4a8ea2a5d0d6aba036f15b185d60e18778f" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Jul 01 08:43:12 2014 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Jul 01 09:27:33 2014 -0700" }, "message": "Fix build target path.\n\nChange-Id: I45ee7efb13ffaff8c15ce6b2aea3076db713c73e\n" }, { "commit": "8d0bc4a8ea2a5d0d6aba036f15b185d60e18778f", "tree": "4c88b6de2ccd4a587c39643b955412586d5a5e6c", "parents": [ "1fe11a5d1b7932a8a4a4e6e8cf1aedd21fcdb3aa" ], "author": { "name": "John \"Juce\" Bruce", "email": "juce@google.com", "time": "Mon Jun 23 12:11:56 2014 -0700" }, "committer": { "name": "Fred Gylys-Colwell", "email": "fredgc@google.com", "time": "Mon Jun 30 20:32:25 2014 -0700" }, "message": "Add Unit Tests for ClearKey Plugin\n\nChange-Id: I0008a01d29ade169df9a0fd30ca0303adf9ecad3\n" }, { "commit": "1fe11a5d1b7932a8a4a4e6e8cf1aedd21fcdb3aa", "tree": "43dab16377cd28fe8bd7a75ae8878f75b37673f7", "parents": [ "7bdf28d2b83e527f474e96b0984d6a3f5eb457f7" ], "author": { "name": "John \"Juce\" Bruce", "email": "juce@google.com", "time": "Tue May 13 22:22:44 2014 -0700" }, "committer": { "name": "Fred Gylys-Colwell", "email": "fredgc@google.com", "time": "Tue Jul 01 03:27:45 2014 +0000" }, "message": "ClearKey Implementation of DRM Plugin APIs\n\nAdds shared-object entry points and interface implementations that\nimplement the Android ClearKey DRM Plugin API.\n\nChange-Id: Ie889747492cf85efe883149833105538faaa4cfe\n" }, { "commit": "7bdf28d2b83e527f474e96b0984d6a3f5eb457f7", "tree": "e35d68483c98e5b261b14102c4cd38f461441114", "parents": [ "6b3c1473199927264691bb50445cf0b35c2f8892" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Thu May 15 17:24:57 2014 -0700" }, "committer": { "name": "Fred Gylys-Colwell", "email": "fredgc@google.com", "time": "Tue Jul 01 03:27:03 2014 +0000" }, "message": "JsonWebKey support.\n\nParses JSON Web Key Set in the response data; extracts and base64 decode\nkey id(s) and key(s).\n\nbug: 12035506\nChange-Id: Ib71bce942d6eca1e569dfad0a9adb6dee1cdf75e\n" }, { "commit": "6b3c1473199927264691bb50445cf0b35c2f8892", "tree": "544711204babcd928e566bdba7a3cc76865d5687", "parents": [ "16dfdcff6e4bb025220b88d5fc132ae48e7cb437" ], "author": { "name": "John \"Juce\" Bruce", "email": "juce@google.com", "time": "Tue Jun 10 21:12:56 2014 -0700" }, "committer": { "name": "Fred Gylys-Colwell", "email": "fredgc@google.com", "time": "Tue Jul 01 03:26:37 2014 +0000" }, "message": "Implement ClearKey Init Data Parser\n\nImplements an object that can convert ISO-CENC or WebM initialization\ndata into a ClearKey license request.\n\nChange-Id: Ib95012afcf40fc9e3f45510a468c305fb7bc216e\n" }, { "commit": "16dfdcff6e4bb025220b88d5fc132ae48e7cb437", "tree": "ae5681b8b32fa261d281749439dc8d912756fa28", "parents": [ "47a86fb32803a37f03a40e4ea13e1f7db6cd728d" ], "author": { "name": "John \"Juce\" Bruce", "email": "juce@google.com", "time": "Tue Jun 10 21:12:37 2014 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Jul 01 03:16:15 2014 +0000" }, "message": "Implement OpenSSL-Based Decryptor\n\nImplements an object that does AES-CTR-128 by invoking OpenSSL.\n\nChange-Id: I8457899ec8b69bd8f0d727029985c9580911cf99\n" }, { "commit": "47a86fb32803a37f03a40e4ea13e1f7db6cd728d", "tree": "b7af2222869cda40e27fd8a59eb36e9678fea961", "parents": [ "f92f22becdf7fce1f55d5ebd80ac2caa2ad55602" ], "author": { "name": "John \"Juce\" Bruce", "email": "juce@google.com", "time": "Thu May 15 16:37:05 2014 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Jul 01 03:02:49 2014 +0000" }, "message": "Add ClearKey Utilities\n\nAdds some utility functionality that is shared by multiple parts of\nthe ClearKey code.\n\nChange-Id: I33a896eb68b2937918f145c9bd27174a119294b9\n" }, { "commit": "b710094cc9fe5eaf4b00b091ba024e2a6837a7c3", "tree": "424038dc821e4b9b310051eeabfed3c30f590efe", "parents": [ "ab5cdbaf65ca509681d2726aacdf3ac8bfb6b3fa" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jun 17 16:45:46 2014 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Jun 20 10:12:12 2014 -0700" }, "message": "Fix Externally reported security issue\n\nbug: 12724697\nChange-Id: I57f37dbb3b01c0c3d3256be67c395352dd6ada13\n" }, { "commit": "31dcd338b3826928646d77f23f977ecdd52598a3", "tree": "62bcf15eb7d991d0c9351c1cf35eb8f5a3887763", "parents": [ "47a2377ec07ad4ec06ecd25bfd45a37df91e68e6", "4299a7c2b049b07b3456a81a4c2b1030523c08ca" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Jun 10 18:41:50 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 10 18:41:50 2014 +0000" }, "message": "am 4299a7c2: am 940f8be3: Merge \"Implement a NoOp DrmManagerClientImpl when no DRM service exists\" into klp-modular-dev\n\n* commit \u00274299a7c2b049b07b3456a81a4c2b1030523c08ca\u0027:\n Implement a NoOp DrmManagerClientImpl when no DRM service exists\n" }, { "commit": "4299a7c2b049b07b3456a81a4c2b1030523c08ca", "tree": "d3540220be0376ea8166a6d60941fd9ef753dc99", "parents": [ "cb3d3a365c91ed996c47dea6ff1490f2f13c1b52", "940f8be3619cecda66dad33f995904795df88c2d" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Jun 09 21:12:44 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 09 21:12:44 2014 +0000" }, "message": "am 940f8be3: Merge \"Implement a NoOp DrmManagerClientImpl when no DRM service exists\" into klp-modular-dev\n\n* commit \u0027940f8be3619cecda66dad33f995904795df88c2d\u0027:\n Implement a NoOp DrmManagerClientImpl when no DRM service exists\n" }, { "commit": "927634a98167e24241b89d80a1ea4511c0bb9cd1", "tree": "3ea03fe6cbbde8d9659015719881e51164e428e6", "parents": [ "e32106fd5175afdf939ae397aece9caf378a4912" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Jun 04 15:14:03 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Jun 06 13:44:55 2014 -0700" }, "message": "Implement a NoOp DrmManagerClientImpl when no DRM service exists\n\nChange-Id: Ib06f429102a51c540c8132f3397130328279e03a\n" }, { "commit": "1b24cf32e02a1372e57b3a2a432bc0adfe496e6d", "tree": "220f4583ae1081df62fa5c861eed3e9e90a24515", "parents": [ "4845b69f70ff457be8d8908f6eb61e2af67e00d3", "e80631aa1992ca50af679cd6a018c0ffda7f9b17" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 23:37:19 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Apr 15 23:37:19 2014 +0000" }, "message": "am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d\n\n* commit \u0027e80631aa1992ca50af679cd6a018c0ffda7f9b17\u0027:\n media: use size_t for integer iterator to Vector::size()\n media: 64 bit compile issues\n" }, { "commit": "e80631aa1992ca50af679cd6a018c0ffda7f9b17", "tree": "6b3fcc9fbb5b02976e4bb2163e994952303bead5", "parents": [ "d4a3cae8cc4cf924925ae57723e61c89f6c4fd51", "839d11d1f7be9dff2f06c7d30a9eb39cb6782078" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 22:35:00 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Apr 15 22:35:00 2014 +0000" }, "message": "am 839d11d1: Merge changes I0a744dc7,Id993a70d\n\n* commit \u0027839d11d1f7be9dff2f06c7d30a9eb39cb6782078\u0027:\n media: use size_t for integer iterator to Vector::size()\n media: 64 bit compile issues\n" }, { "commit": "3ab368e0810d894dcbc0971350c095049478a055", "tree": "a50053c391da8c02797158395f2ecfec83218855", "parents": [ "db43b34c3428e480f8c4c66e7e88f4001f37f91e" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 14:55:53 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 14:57:31 2014 -0700" }, "message": "media: use size_t for integer iterator to Vector::size()\n\nChange-Id: I0a744dc7815a86a993df9b0623440be620ec8903\n" }, { "commit": "99021c47f45ee8bf3317cff7d08226e76c8d8227", "tree": "5f8c264aefbb41cab611f5db8272c36827b9fa39", "parents": [ "118e7ff24af2e470ffed2bf7b37c9afa69afee92", "f356a123bf966150965a1af1cb9bd6ff2ca020de" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Apr 01 22:23:23 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Apr 01 22:23:23 2014 +0000" }, "message": "am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrm\n\n* commit \u0027f356a123bf966150965a1af1cb9bd6ff2ca020de\u0027:\n Support CAST V2 Authentication in MediaDrm\n" }, { "commit": "f356a123bf966150965a1af1cb9bd6ff2ca020de", "tree": "22c31d7cd8430663ee6a78b5daafffc718f11454", "parents": [ "4f1ef2cd65d734edae17f8586cf717598b40f2c3", "68d9d71a792deed75d32fe13febc07c9c12c8449" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Apr 01 22:00:45 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Apr 01 22:00:45 2014 +0000" }, "message": "am 68d9d71a: Support CAST V2 Authentication in MediaDrm\n\n* commit \u002768d9d71a792deed75d32fe13febc07c9c12c8449\u0027:\n Support CAST V2 Authentication in MediaDrm\n" }, { "commit": "68d9d71a792deed75d32fe13febc07c9c12c8449", "tree": "15ba0a2a541bd0b69fa286d04c9cc40d30b49871", "parents": [ "1000d426bedb1ec38bdfff98fc8f004b64af13cb" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Mar 04 13:21:31 2014 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Sat Mar 29 08:43:09 2014 -0700" }, "message": "Support CAST V2 Authentication in MediaDrm\n\nJava API version\n\nUpdate frameworks to enable support for CAST\nV2 Authentication in the DRM Plugin.\n\nChange-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861\nrelated-to-bug: 12702350\n" }, { "commit": "37e05edf1cfe297f9c7d382787ecab53d5a2b5c8", "tree": "91985c91ec47023bbfe1ed0b94a8ed9bcb5af1db", "parents": [ "947237f67dd5335b26326a98fd7d3eae5fd7d702", "9a9481f89b26211b20d7f3fde3d54b455843bf70" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Mon Mar 17 23:32:11 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 17 23:32:11 2014 +0000" }, "message": "am 9a9481f8: am 0e7e5db7: Merge \"More 32-bit only\"\n\n* commit \u00279a9481f89b26211b20d7f3fde3d54b455843bf70\u0027:\n More 32-bit only\n" }, { "commit": "0e56849007a0f128201e545b610f119217b41376", "tree": "58e22c5f2fc8113c6e3fc185dbb8ca98dcf32f13", "parents": [ "089affb6c2d9ed1e2d49df4be02d30dc490506f9" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Mar 14 15:36:20 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Mar 14 17:25:04 2014 -0700" }, "message": "More 32-bit only\n\nChange-Id: Ic333215e39757f91b12d66b8a9ad7f43c8ba8b36\n" }, { "commit": "9d79834400009f690d04726d2bb746a9e8281ede", "tree": "8578224331b4c701b977596ad2b914aa466b5496", "parents": [ "591d9a3652f868652ccc48dd9e9714f3a9813963", "e0a76795125a81471c408d4a23112e98ae2f0ae3" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Wed Feb 26 19:35:43 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 26 19:35:43 2014 +0000" }, "message": "am e0a76795: am 5969b408: Merge \"Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH\"\n\n* commit \u0027e0a76795125a81471c408d4a23112e98ae2f0ae3\u0027:\n Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH\n" }, { "commit": "f2d170f6790329dd73c61b8704055e1dff4112a2", "tree": "69d36b08bcac8aea963c5f6b022b8438b714d126", "parents": [ "8fc4d57d41f532b90187b9404a8ac705770d75b4" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Wed Feb 26 11:07:24 2014 -0800" }, "committer": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Wed Feb 26 11:07:24 2014 -0800" }, "message": "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH\n\nChange-Id: Ifef0dd59ab317b1799fc899bb2e898bb09d2e5f6\n" }, { "commit": "1d6fa7af1288b550faabe4ec2cf98684236723db", "tree": "a8801ca9a0925ba1faccf17acea4aa78d71a9d29", "parents": [ "b82a9f105f89d6b3684c9f626918042bd8977912", "566be7c33fc56ae4c34168ecbee5316374f7e3c5" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Feb 11 13:47:53 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Feb 11 13:53:20 2014 +0000" }, "message": "resolved conflicts for merge of 566be7c3 to master\n\nChange-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce\n" }, { "commit": "377b2ec9a2885f9b6405b07ba900a9e3f4349c38", "tree": "b938e1d75a1beefae86244f287ca22f4a277740d", "parents": [ "cdda7bf4d3ca9cad6979374a18dd5be79ea83d80" ], "author": { "name": "Kévin PETIT", "email": "kevin.petit@arm.com", "time": "Mon Feb 03 12:35:36 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Feb 11 11:40:06 2014 +0000" }, "message": "Make frameworks/av 64-bit compatible\n\nContains the necessary changes to make frameworks/av build and work\non a 64-bit machine.\n\nSigned-off-by: Craig Barber \u003ccraig.barber@arm.com\u003e\nSigned-off-by: Kévin PETIT \u003ckevin.petit@arm.com\u003e\nSigned-off-by: Ashok Bhat \u003cashok.bhat@arm.com\u003e\nSigned-off-by: Marcus Oakland \u003cmarcus.oakland@arm.com\u003e\n\nChange-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43\n" }, { "commit": "9be49c915852b592a881be3905658e4fc698749d", "tree": "043ffa8d835b63a41af470fdb51d580774b0008e", "parents": [ "5f44635dc35814b98b4dc2b255355a93122fec59", "bb9e396d311ea38e958fb5b56efff7aea4eaed82" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jan 28 01:08:42 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 28 01:08:42 2014 +0000" }, "message": "am bb9e396d: am 06f7d151: am 06da69d5: Merge \"frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH\"\n\n* commit \u0027bb9e396d311ea38e958fb5b56efff7aea4eaed82\u0027:\n frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH\n" }, { "commit": "7d6fc5ebc8718ebb5bf505d9bda83ab63741a545", "tree": "3dff65731f7dcb75e20974287e8008c7048ca86f", "parents": [ "4ef1dc2d5b5f5df93b173b0b4c4719d4484e031d" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jan 24 21:00:32 2014 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Jan 27 12:39:29 2014 -0800" }, "message": "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH\n\nLOCAL_MODULE_PATH doesn\u0027t work for multiarch builds, replace it\nwith LOCAL_MODULE_RELATIVE_PATH.\n\nChange-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e\n" }, { "commit": "817d4aa19e6a9c95ec20486e6d74dea5a38e7236", "tree": "e7d4814f283c3f27a9778e81bb4e222ee762c73d", "parents": [ "1dfca7775f0b8352a0fd6cfed1e70075e5fa4e75" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Nov 08 14:37:33 2013 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Nov 08 14:37:33 2013 -0800" }, "message": "Fixed file descriptor leak in FwdLockEngine::onGetOriginalMimeType.\n\nBug: 11534051\nChange-Id: I0ab56b0a96b30f721bcac1d1ccc6ca85c3271ef5\n" }, { "commit": "34486800a022857b45c3882624449980c5cb6907", "tree": "06e1a76a831666df008d5ba344b2c8e34bce27ef", "parents": [ "fe346c707f59d763ded93bc3d27b51f0c0408258" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Sep 11 18:40:44 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Sep 11 18:40:44 2013 -0700" }, "message": "Fix MediaDrm cts tests\n\nMoving the build of the mock MediaDrm plugin back to\nframeworks/av since it can\u0027t be installed by cts.\n\nb/10668350\n\nChange-Id: Id662bdb0775389b458f86a299392217f2d959422\n" }, { "commit": "4585e8f0ff47580fdb81ed8652bde32db1770050", "tree": "6aa5196aef1b75edc79199065ad825c26da64533", "parents": [ "e45a767e13fe3396185c9d378a70f7f11eb881d0" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Aug 30 23:05:00 2013 +0000" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Sep 03 10:15:01 2013 -0700" }, "message": "Revert \"Enhancement for OnInfo callback on DRM Framework\"\n\nThis reverts commit 5ff7836da0220b3097f36c8a5e82111816ebca62.\n\nFixes Fatal signal 6 (SIGABRT)\" when playing or downloading a video\nbug: 10542864\n\nChange-Id: I7f81a41c3acdbeb571a514b3f65e7ba37d403cca\n" }, { "commit": "ee7e77d55d510725a314d8ed36dc730c21af6173", "tree": "02b7cfa93dd77e7927b67cc6d85d865e3e6bd0c3", "parents": [ "8271f1a2225a34a0748624786392213a746c56d7" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Aug 28 16:40:41 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Aug 28 16:40:41 2013 -0700" }, "message": "fix MediaDrm.isCryptoSchemeSupported(uuid)\n\n1. Don\u0027t expect plugins to support an empty mimeType in isContentTypeSupported\n2. Move the cts test mock drm plugin to the cts tree so it is always used\n\nb/10528466\n\nChange-Id: I6023f6165b1e9d294986f7e5cd0896e056e376f1\n" }, { "commit": "5ff7836da0220b3097f36c8a5e82111816ebca62", "tree": "4612e1308d3dd9961db0fae6d3372203d5937f61", "parents": [ "62c1a46eec047eb5fbc4b90432ec1ce65b76fb75" ], "author": { "name": "Takeshi Aimi", "email": "takeshi.aimi@sonymobile.com", "time": "Wed Jul 11 17:09:21 2012 +0900" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Aug 23 18:01:07 2013 -0700" }, "message": "Enhancement for OnInfo callback on DRM Framework\n\nIn DRM framework, plugins can transmit DrmInfoEvent to Java layer.\nAlthough DrmInfoEvent has several entries, current implementation\ncan only convey integer and String. This change enables plugins\nuto propagate a hashmap to Java layer. The hashmap can have\none or more Strings and one byte array as value.\n\nChanges are made by Sony Corporation.\n\nbug: 10459159\n\nChange-Id: Ic19265d4ad3db4eda66a3c27e1e08873a8f2a4d7\n(cherry picked from commit 4f782bf0cb69929ebf03de239e2c9bf8e82adf5e)\n" }, { "commit": "9cf69e0fc110f17c28e988ed0f9bf91abfaf710d", "tree": "c5cb3fb67b26c852f8c7bea7e4eeb87952830842", "parents": [ "75c16dde986e16ac5fd4d34b06b0cc6a90679866" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Aug 21 11:59:23 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Aug 22 09:27:35 2013 -0700" }, "message": "Add ability to test supported content types to MediaDrm\n\nbug: 10244066\nChange-Id: I317f05b146db962c271893f6208890a5a6c396f1\n" }, { "commit": "f355f18aa2cc1706761e373fe19298a9ccc9c75a", "tree": "72caa7cb946dd0de42de5dc30e83b5e99137485d", "parents": [ "20f4754b7e687d3718a0a0a585f2c9ac22e2567d" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Jul 22 15:54:42 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Jul 23 11:32:15 2013 -0700" }, "message": "Remove obsolete drm manager code\n\nbug: 9545965\nChange-Id: Ia6e09efa826b1349d027045e782980daeb7d7596\n" }, { "commit": "423e33ce6569cb14ecf772e9670208517f7b30c4", "tree": "aa34178c7ba71151b4cb1a462da0679afcd37323", "parents": [ "f4c873a64db2d5d2d74ca596e7482627dd6b4238" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Apr 08 15:23:17 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Apr 16 23:01:17 2013 -0700" }, "message": "Added CTS test for secure stop APIs\n\nbug: 8604418\n\nChange-Id: I173fa1ec904ba11dc4cff0343462b3f4bac0d365\n" }, { "commit": "da0dc0af0effe9fbfb3ce3187c8472fca2baf3c6", "tree": "67aa5a912048834766759d1842f7e54a20f74481", "parents": [ "ec77122351b4e78c1fe5b60a208f76baf8c67591" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Tue Apr 09 21:53:49 2013 -0700" }, "committer": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Tue Apr 09 21:53:49 2013 -0700" }, "message": "Add liblog\n\nBug: 8580410\nChange-Id: If493d87d60d71be664ad75b140c62acadb75b0d0\n" }, { "commit": "c0d5f1f8405de861ed6f1725f26cd6601e7103ab", "tree": "710d03a7ee6541642c1dc16ac82b4ffea3903968", "parents": [ "4c63a239c404af1e055e5f9939939ab0fd09d98a" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Apr 02 13:08:05 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Apr 03 12:20:53 2013 -0700" }, "message": "Implement async event callout from drm plugin to Java app\n\nChange-Id: I007f147d693664e777b8758be2bb8a4c7ec0236b\n" }, { "commit": "4c63a239c404af1e055e5f9939939ab0fd09d98a", "tree": "5ec5bdcc0de9cb139df551a2b6e5c6010497e9ac", "parents": [ "4fc3e841358164a661c78f78bc617f5ac879aa35" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Sat Mar 30 16:19:44 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Apr 01 21:57:32 2013 -0700" }, "message": "MediaDrm API update\n\nClarify offline usage of sessions and keys and implement\nimplement CryptoSession to support additional crypto use\ncases.\n\nChange-Id: I5d8000ce7e1dd7eba08969fc50296c9e1456c4fc\n" }, { "commit": "441a78d5e224e0d67f9b52fa9adc795c6944159b", "tree": "855eed2e1ee757c6019b6da9137d659fdc20fdcf", "parents": [ "c148e7a671c289f82f6ca40e29defcc43e1c6d0b" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Feb 08 10:18:35 2013 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Mar 13 13:39:48 2013 -0700" }, "message": "Implementing MediaDrm APIs\n\nChange-Id: I9ff8eeb7d0c383b5c0c68cd54eb54ce7d2d22fe6\n" }, { "commit": "558d60e4e2217e02b3e7adf7afaf51d1c6e08f91", "tree": "115bba1eb50a969fb98c1ece924ae7edb2d4df31", "parents": [ "2d45dbd1910a7e51d383e8583017e6f26cd3498a" ], "author": { "name": "Henrik B Andersson", "email": "henrikb.andersson@sonymobile.com", "time": "Sun Jul 15 07:46:29 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Jan 28 18:34:58 2013 -0800" }, "message": "Remove unnecessary lib dependencies in the FL makefile\n\nChange-Id: Ia1e81a91b4b8dc1bf3558a4aa06e90a955c6fbe6\n" }, { "commit": "2d45dbd1910a7e51d383e8583017e6f26cd3498a", "tree": "260d8bd329b3e2004f7fb995a4a21d32588252f8", "parents": [ "0bf43848adb00922122b0a0eed2fa0318bde8317" ], "author": { "name": "Hung Nguyen", "email": "hung.nguyen@sonymobile.com", "time": "Tue Jun 05 13:19:53 2012 +0200" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Jan 25 16:25:18 2013 -0800" }, "message": "Fixed bugs where the content of buffer holding keys was cleared using a wrong size in forward lock\n\nModified by James Dong \u003cjdong@google.com\u003e\n\nChange-Id: Iaacfc79b2b26bdee7046d8555e3b4e0bc224c3c5\n" }, { "commit": "0bf43848adb00922122b0a0eed2fa0318bde8317", "tree": "b8b0ca3491d76059f03e97f695949876b6e153bc", "parents": [ "13f7fe763b9ad52fc27f21ed923c46b9555a321f" ], "author": { "name": "Hung Nguyen", "email": "hung.nguyen@sonymobile.com", "time": "Tue Jun 05 13:19:53 2012 +0200" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Jan 24 15:42:42 2013 -0800" }, "message": "Fixed memory leakage in the DRM framework\n\nChange-Id: Ib1276bec6cafb4e94f8f13b52e50e4987765eec4\n" }, { "commit": "13f7fe763b9ad52fc27f21ed923c46b9555a321f", "tree": "5bcd3cda2da2ab8a1e2f191113fe01c2f5f63664", "parents": [ "2a330d6cbb25f0cdd6208aeee53b4a3b88dae3b0" ], "author": { "name": "Henrik B Andersson", "email": "henrikb.andersson@sonymobile.com", "time": "Fri Oct 26 15:15:15 2012 +0200" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Jan 24 12:49:26 2013 -0800" }, "message": "Fix for not ending up in an eternal loop in DrmManager.\n\nIn the original code a random number is used to get try\nto find an empty slot in the list of free DRM id\u0027s.\nWhen you reached the limit of 0xfff id\u0027s you ended up\nin an eternal loop causing ANRs.\n\nUpdated by James Dong \u003cjdong@google.com\u003e.\n\nChange-Id: I70176cc3f770223c4a8060f9739fe2bc03a703d9\n" }, { "commit": "0abeaca9d1b53ee40ce9c9d2ef543dd83b5a4cc2", "tree": "e17375f6532c5720d8b835cdf242e5016eb5a49f", "parents": [ "74e58c55bc5259b957a51f1bb44a5911ad1f8400" ], "author": { "name": "Gene Morgan", "email": "gmorgan@google.com", "time": "Fri Sep 14 13:35:39 2012 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Sep 20 11:52:33 2012 -0700" }, "message": "Allow DRM client to pass the FD of an open file to the DRM server.\n\nPart of CL https://googleplex-android-review.googlesource.com/#/c/222797/\nThis modifies the marshall/unmarshall of IDrmManagerService::\nacquireDrmInfo() to watch for DrmInfoRequest tag \"FileDescriptorKey\".\nIf tag is present convert string to binary FD, then back to string\nafter passage through the interface\u0027s Binder.\n\nRelevant bug reports:\nbug: 6426185\n\nChange-Id: I63748b7c986ca0a89613ed3f1c81f24cffb7a9b2\n" }, { "commit": "bf5b3b29e31b293313788d7464cfb258ac0da803", "tree": "1e3e016a1f7268688be59047be835a17609977f8", "parents": [ "b3e12a4d15a329821979bf287c49a9630486e23f" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Jul 30 17:57:39 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Aug 10 17:38:19 2012 -0700" }, "message": "Let getOriginalMimeType() take a fd passed from drm java applications\n\nThis patch enables the drm framework to avoid opening files directly.\nAs a result, the drm framework no longer needs the sdcard read permision.\n\no related-to-bug: 6426185\n\nChange-Id: Ib176c35ef4b1a1a405e8e954f19a7985266f2510\n" }, { "commit": "9352d1168c09903d4ea27b695ef683316c544ae5", "tree": "8a5d71edb9d565bf0e7d671abe08d059a933e35f", "parents": [ "0d27c65ddb5c968baa6db0c26e80f5c451bc52bc" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Aug 08 17:19:18 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Aug 08 17:20:28 2012 -0700" }, "message": "Remove some unused forward lock code\n\nChange-Id: I94d01f6ad5b1676cc4d6a95807e166f3c25aa79c\n" }, { "commit": "cc0df657cdc8316c2b816c562f269be1706f00ea", "tree": "d8bbb1b8a1431846f7adc665d88cbe5f6dd4c654", "parents": [ "8fe9840be2ce6aac8a008fc15cb641f858b5a32e", "e20435de10f63af812da9d4f801b61a8817733a0" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jun 13 20:51:33 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 13 20:51:33 2012 -0700" }, "message": "am e20435de: Merge \"Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/\" into jb-dev\n\n* commit \u0027e20435de10f63af812da9d4f801b61a8817733a0\u0027:\n Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/\n" }, { "commit": "3d51d5cb53cc630709a0ba78d0e60501a675f2d5", "tree": "c01dc8011b4e0061343c8b60b0da3508c63ae822", "parents": [ "b4ea1ab821d652cb080910d4081f5f1318597a90" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Jun 12 18:10:35 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jun 13 15:18:29 2012 -0700" }, "message": "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/\n\nChange-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26\nrelated-to-bug: 6647465\n" }, { "commit": "cba7b32d8f2c47632313f54118ed3733b4b02cc8", "tree": "b24101645accdc9067e7970ef22f3d934bda8edf", "parents": [ "cf0bf78c28cf25c30c42c784c1dc5bc094e6035d" ], "author": { "name": "Kei Takahashi", "email": "KeiA.Takahashi@jp.sony.com", "time": "Wed Jan 18 17:10:19 2012 +0900" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed May 23 14:44:06 2012 -0700" }, "message": "Add a new API on DRM Framework for streaming\n\nIn case of DRM streaming, decrypt session can start just after\nreceiving the header, and it doesn\u0027t need to wait for the entire\ncontent. However, current API of DRM framework only accepts file\nhandle or URI. With this new API, DRM session can start\nwithout waiting for the entire content.\n\nChanges are made by SEMC and Sony.\n\nChange-Id: I74375fe127df636067f1c300ea91654ba3d1aa3c\n" }, { "commit": "1608735ef488ecd8c3c012a3b0d4b1d4ef3d93c7", "tree": "c77756706095cdb6852e56392e8365bcaa7d9232", "parents": [ "a98db787397633155fd71b06ecaa765a7ad20cf2" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Apr 13 14:54:36 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Apr 17 11:22:11 2012 -0700" }, "message": "Support widevine:// URLs in NuMediaExtractor / java MediaExtractor.\n\nAllow anyone to talk to drm services.\n\nChange-Id: I5c2f3c419d01de30c3d6e2bc85b1fe5c9c37b392\nrelated-to-bug: 6276111\n" }, { "commit": "ed5b285520ae1ddad78b7c945d659a2c1f3140b8", "tree": "19f1bd4de2eace3c5297d649ce711285df777e21", "parents": [ "4b75a9c8b93a90749bc5d22912ad0d96c12f4ecf" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Mon Apr 09 12:55:18 2012 -0700" }, "committer": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Mon Apr 09 12:55:18 2012 -0700" }, "message": "You don\u0027t need LOCAL_SHARED_LIBRARIES/LOCAL_STATIC_LIBRARIES to build a static library.\n\nChange-Id: Ia2c4b4fb3b78cbe0d2856cec073b2c7f9c28d3cb\n" }, { "commit": "cec40f97a8c0b9a43a78ae98fc35fcc80d6f6c4f", "tree": "46d31c1f2e52e2d36a682ca978f3e3611a916b4e", "parents": [ "559bf2836f5da25b75bfb229fec0d20d540ee426" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Mar 28 15:01:36 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Mar 28 15:08:34 2012 -0700" }, "message": "Removed unnecessary include JNI from two drm Android.mk files\n\nChange-Id: I7b7a1acce4d6db748ff193270e73bc3582ba2380\n" }, { "commit": "559bf2836f5da25b75bfb229fec0d20d540ee426", "tree": "d7dd708b17eeca96a3e5d8bcc25a51ff3d1b5d0d", "parents": [ "b0b2b4d890cf3bfb274797a759642b4e733343d7" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Mar 28 10:29:14 2012 -0700" }, "committer": { "name": "Anatol Pomozov", "email": "anatol.pomozov@gmail.com", "time": "Wed Mar 28 12:07:41 2012 -0700" }, "message": "AV Android make files changes\n\no plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc\no remove some runtime dependencies to libandroid, libandroid_runtime, etc\n\nChange-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10\n" }, { "commit": "27e52c70cf02ee5f7f6b49df80674c5fbf8a7a2e", "tree": "ee478a3f921519b7a79b194b8142124697c7b474", "parents": [ "75979dc147c4d2f832730da2e9b68d93ce892ba3", "ad6ec91c0bca37587e28bf72dfc38cde1b90544f" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Mar 14 10:43:22 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 14 10:43:22 2012 -0700" }, "message": "Merge \"make sure that lower-case mime and file suffix is used to check against the supported ones\"" }, { "commit": "75979dc147c4d2f832730da2e9b68d93ce892ba3", "tree": "b26fb398fb90419a003547ec3a08157440acc48b", "parents": [ "edc8a8e6054d67b22ec27d62f0abfdafafd66b76", "35250664455c9642cc14d3831b663880637a7d70" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Mar 14 10:43:18 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 14 10:43:18 2012 -0700" }, "message": "Merge \"Fixed a buffer overflow bug in DrmPassthruPlugin\"" }, { "commit": "35250664455c9642cc14d3831b663880637a7d70", "tree": "5235afea54b20fde679fe3f4b1ac8c7442a4376f", "parents": [ "aa4397f07c43bd83bc3100b749401dc3d15e7622" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Mar 13 19:20:55 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Mar 13 19:23:23 2012 -0700" }, "message": "Fixed a buffer overflow bug in DrmPassthruPlugin\n\nChange-Id: I8df2a90409c9266a094a1a0904a5ff76ec483d16\n" }, { "commit": "0a38af09ebbacdc9aa0d5ecb24e2f0484bf4f191", "tree": "bb23c2fbbdd3ed276b0eba5237bfc0762b3a2b16", "parents": [ "aa4397f07c43bd83bc3100b749401dc3d15e7622" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Mar 13 18:54:16 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Mar 13 18:54:16 2012 -0700" }, "message": "Turned off log spamming from DrmPassthruPlugin\n\nChange-Id: I2cecdba49cf044d2aafd8aa404d27df311cad401\n" }, { "commit": "ad6ec91c0bca37587e28bf72dfc38cde1b90544f", "tree": "3bfd1f4840a7230a517284c3c1a35405877545b7", "parents": [ "aa4397f07c43bd83bc3100b749401dc3d15e7622" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Mar 12 23:20:29 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Mar 13 14:54:02 2012 -0700" }, "message": "make sure that lower-case mime and file suffix is used to check against the supported ones\n\nChange-Id: I6a20832f6a2dfb8554dbddef0dee87cc21c05c80\n" }, { "commit": "f67fdc6d8bb31226ffeeecbff6aca610befd0110", "tree": "d9040fa17452df1d10c51ea18f9bff5e8f8843b8", "parents": [ "d64f3a376536a993fe6d81730b8b7b738500435e", "bd2f13ddbe7a9e7550205f6b53880329e09b9457" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Mar 12 10:33:38 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Mar 12 10:33:38 2012 -0700" }, "message": "Merge \"Avoid checking supported mime types or file suffixes in multiple places\"" }, { "commit": "bd2f13ddbe7a9e7550205f6b53880329e09b9457", "tree": "0319c10c1db0fbc2ae32b3ae6a202324e228ad07", "parents": [ "083c154162c88a9f63aeaa10a4b52dd454bda9ff" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Mar 09 17:33:42 2012 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Mar 09 17:44:11 2012 -0800" }, "message": "Avoid checking supported mime types or file suffixes in multiple places\n\nChange-Id: I47d24070c7bda385cd1d7fa1f6a75dbb1f82b476\n" }, { "commit": "9c78e8681dafcdf265bc733875bad436ef9ec220", "tree": "4101804d01eda87a39da4a40fe138f4e3adabdd3", "parents": [ "083c154162c88a9f63aeaa10a4b52dd454bda9ff" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Mar 09 13:05:17 2012 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Mar 09 13:21:31 2012 -0800" }, "message": "Added an failure log message when the fwdlock engine fails to open a given file.\n\nChange-Id: I0e7f60b61f03fde046fc1ad668b28cdee635898b\n" }, { "commit": "328745b130c1c59e53d68a9a3c71675d3932d34b", "tree": "c35e7d4e33ecbde14e93d658d3d91cc52fbd35ac", "parents": [ "0f7affe1716dfd6687262008120ed128df1af214" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Feb 28 13:55:55 2012 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Feb 28 18:50:44 2012 -0800" }, "message": "Added permission check for all sensitive drm API calls\n\no all drm calls using a DecryptHandle now check the permission before proceeding\n\nChange-Id: Ic992a991357876c6e4bfbfab4f5eec1fa0634a13\n" }, { "commit": "d907e9451ec3c7b2244dd5605f1a26ab23466a7a", "tree": "d54de2611c108f2ee1a240c89a90d13be95de9b9", "parents": [ "843a12d146bd64642bf85a4e56c274246e3893a6" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Feb 27 22:20:28 2012 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Feb 27 22:26:48 2012 -0800" }, "message": "Remove unnecessary header file includes for drmserver\n\nChange-Id: I14033861e74d20f9d4897b651c4eeee126d4d610\n" }, { "commit": "9d2f386dd2885eaffa11fd494ae258bb09fe6397", "tree": "382639f8cc7f1a3677589d7dfca37b667ea4261c", "parents": [ "83bc7f3cf78b28a818417f40a4f0c00593993366" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Jan 10 08:24:37 2012 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Jan 12 16:25:12 2012 -0800" }, "message": "Separate sniffing from session initialization\n\nThis avoid lengthy/duplicate sniffing for drm plugins when a decrypt session is opened\n\no The change is backward compatibile in that no update is required\n for existing drm plug-ins if they do not plan to provide separate\n sniffer/extractor\n\nrelated-to-bug: 5725548\n\nChange-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c\n" }, { "commit": "29357bc2c0dd7c43ad3bd0c8e3efa4e6fd9bfd47", "tree": "3bdafe4b02fe36f6ee29c3170f0b0d2799bebf86", "parents": [ "d709ca9c6a0fa1c8f40cbe624a119398643c5087" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Fri Jan 06 19:20:56 2012 +0000" }, "committer": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Sun Jan 08 13:19:13 2012 +0000" }, "message": "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE\n\nSee https://android-git.corp.google.com/g/#/c/157220\n\nBug: 5449033\nChange-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c\n" }, { "commit": "5ff1dd576bb93c45b44088a51544a18fc43ebf58", "tree": "c002dcda87f08329197b01395539bd25f10ca737", "parents": [ "8a08dcc0a5de19a904e77d5f31bed3dff9a59890" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Thu Jan 05 23:22:43 2012 +0000" }, "committer": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Fri Jan 06 10:07:54 2012 +0000" }, "message": "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE\n\nSee https://android-git.corp.google.com/g/157065\n\nBug: 5449033\nChange-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69\n" }, { "commit": "b8a805261bf0282e992d3608035e47d05a898710", "tree": "7a43908b8e936ac1f30eef0542b40d667c47aa23", "parents": [ "94023fa6744e24f26f0aba1699ec278649bd66df" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Tue Dec 20 16:23:08 2011 +0000" }, "committer": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Tue Jan 03 22:38:27 2012 +0000" }, "message": "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE\n\nSee https://android-git.corp.google.com/g/156016\n\nBug: 5449033\nChange-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298\n" }, { "commit": "2a3d6e1b6cfd2d564a48371598fdc664ea40fa8c", "tree": "a1031e278f98ee35c02b14f322e4f1f0c60ae9e1", "parents": [ "5805f995ef365bf00fcccd5c1f948086c17ec75e", "26c2a6bf34b370d467cab4753e5a4b187ba62c0f" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Dec 14 13:53:31 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 14 13:53:31 2011 -0800" }, "message": "am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert \"Fix drm flag setting missed in false drm recognition fix.\" This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.\n\n* commit \u00273f6a7d1ee961a4544563932b7499535dc1cac1ec\u0027:\n Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert \"Fix drm flag setting missed in false drm recognition fix.\" This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.\n" }, { "commit": "785ee06d106cd7958e0c151ebc6b7174d9ba861e", "tree": "52cb291bf974f4593277cc1142e514ebadae4b89", "parents": [ "19e9d0fe6dc3ff4fb1807fee2ad058bf3277e883" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Dec 14 10:57:05 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Dec 14 11:01:59 2011 -0800" }, "message": "Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck\n1. Revert \"Fix drm flag setting missed in false drm recognition fix.\"\n This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.\n\n2. Revert \"Fixed the false drm recognition.\"\n This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230.\n\n3. Revert \"Fix drm enumeration order, resolves failure to play forward lock ringtones\"\n This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369.\n\n4. Revert \"Fix ANRs due to Widevine DRM plugin sniff taking too long.\"\n This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9.\n\nAs a result of the reverting, many ANRs from WV sniffing are back.\n\nrelated-to-bug: 5739618\n" }, { "commit": "50a44951baf856cda679e78947e369ce923a6517", "tree": "ed289e8d756105114a04b35dbef3c027454f49f7", "parents": [ "fec2284d520fa2856358692095a715678225abcb", "2a82a3a8824904f4e6750eb18dcc33ed113edbeb" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Dec 12 15:39:17 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 12 15:39:17 2011 -0800" }, "message": "am f14dc291: Merge from ics-mr1\n\n* commit \u0027f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1\u0027:\n Fix drm enumeration order, resolves failure to play forward lock ringtones\n" }, { "commit": "a9d421d3c05b98ee5481428ca3dcb3e3245140ff", "tree": "9923d2dba8b8bf93adb3e4a54aa8788031f6c75b", "parents": [ "7e976e926dd8085a64a7add97ce09bfeca26e088" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Dec 09 20:04:17 2011 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Dec 09 20:04:17 2011 -0800" }, "message": "Fix drm enumeration order, resolves failure to play forward lock ringtones\n\nChange-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9\nrelated-to-bug: 5735466\n" }, { "commit": "40ddcb7150a31052ba20878454426dc3572b7acb", "tree": "cf08d0d860d0d353c4d14647f719ea80f0346a29", "parents": [ "6a9ab553ebd36705d3edacc6deb6a27dd6b799a3" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Nov 10 14:58:44 2011 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Nov 10 14:58:44 2011 -0800" }, "message": "Fix log message\n\nLog did not have a tag, and was wrong level\n\nChange-Id: I8d12895c80483e1e39f117a393b8be2f4bdd3e1d\n" }, { "commit": "3856b090cd04ba5dd4a59a12430ed724d5995909", "tree": "a24e4c98fa6049fd8085826be838000f9a67e39b", "parents": [ "1d2acaffde56ad79e6e96f228d7857863462397c" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Thu Oct 20 11:56:00 2011 +0100" }, "committer": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Wed Oct 26 09:57:54 2011 +0100" }, "message": "Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE\n\nSee https://android-git.corp.google.com/g/#/c/143865\n\nBug: 5449033\nChange-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a\n" }, { "commit": "5f6f4e4e89bc9b234d89276aea3eae7f677e2ff7", "tree": "5e622df3a534d6023470490592a5ebb79b116310", "parents": [ "fb6f03425a791dcc4188462c860becf6ca6be4ea" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Sep 21 19:18:30 2011 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Sep 21 21:50:31 2011 -0700" }, "message": "Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded.\nBUG: 5284436\n\nChange-Id: I99267c81a488860c3c7edb747100d44f3083bfc2\n" }, { "commit": "cfff1f2b0bac432fac49f0b21e09e08f0e913622", "tree": "dbcae16e000420b1a7bf15e48d6c088c1c0bab24", "parents": [ "6801b4dbd00b485ecdcd31b517ed885a8fa21c63", "e3c56d16412882e2dac697fbe6fa9852ee4dee31" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Aug 04 15:13:14 2011 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Aug 04 15:13:14 2011 -0700" }, "message": "resolved conflicts for merge of 845fdba7 to master\n\nChange-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce\n" }, { "commit": "e3c56d16412882e2dac697fbe6fa9852ee4dee31", "tree": "59ecf59e6635c9820f9ce60b553034406251d644", "parents": [ "1de2393648b9fe43977ef88b72489fec05d629a9", "90855078eb989944bca1824058d7231cd68e5021" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Aug 04 14:47:43 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 04 14:47:43 2011 -0700" }, "message": "am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge \"Bug fixes in OMA DRM v1 Forward Lock Agent\"\n\n* commit \u00278a6fb50d69ec40a413b117bc9145a97ec427852f\u0027:\n Bug fixes in OMA DRM v1 Forward Lock Agent\n" }, { "commit": "90855078eb989944bca1824058d7231cd68e5021", "tree": "37223af2787c451afadf1a9e392ade89450d2f9a", "parents": [ "93a1e245c94f14b6fb68361f76e46285431dab26" ], "author": { "name": "Henrik B Andersson", "email": "henrikb.andersson@sonyericsson.com", "time": "Mon Feb 21 14:22:08 2011 +0100" }, "committer": { "name": "Henrik Baard", "email": "henrik.baard@sonyericsson.com", "time": "Thu Aug 04 13:43:02 2011 +0200" }, "message": "Bug fixes in OMA DRM v1 Forward Lock Agent\n\nA couple of fixes in the Forward Lock Agent.\nThe DRM Framework isn\u0027t thread safe so the Forward Lock Agent needs\nto protect the private structures.\nBase64-encoded content with LF-only instead of CRLF line breaks is now\naccepted.\nA fix for non-standard boundary characters.\nThe debug prints are also turned off as default.\n\nChange-Id: I8ab417231380fbe1c371d18a147773ceabc6f69f\n" }, { "commit": "197f047db2909c3d8cc84b95f69d18410a935fb8", "tree": "a8129a741f28a599d75621b6e74ea93950fa9639", "parents": [ "288b66b60c9b3af3d84408885d0a4030c45eea9a" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Aug 01 10:31:24 2011 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Aug 01 10:52:49 2011 -0700" }, "message": "Fix ordering assumption of argument evaluation.\n\nNo specific order is specified in the C++ standard, but the order of\nthe calls to Parcel read commands matters. Move any calls with multiple\nreads to local variables.\n\nFix for bug 5103507.\n\nChange-Id: Ic23ad50ec5f443146f00324b66d5e2bd5b9ffd0d\n" }, { "commit": "8f00151cbe693d52f3e233757c57fab3b6396d21", "tree": "e23cc93514f43af27aa3e2d7bcfce1b88d614a2b", "parents": [ "60c93010e8f96a179574ec66c00ec47a675319e3" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Jul 21 15:10:22 2011 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Jul 25 16:09:58 2011 -0700" }, "message": "Fix for bug 4371230.\n- Generate unique ID for each DrmManagerClient in native side\n- Fix the bug where multiple clients could use the same ID\n- Return the correct unique ID back to Java\n- Add a flag in the unique ID to separate native client and Java client\n\nChange-Id: Ia4574b6b0a526f2335a65380975dc62f9a6e7f9b\n" }, { "commit": "5e0067b486c3862316aa1f293cf9690c0cf54bda", "tree": "104ac8491b40d6e9d8353322792fb83ce76f4c82", "parents": [ "52f556b976a9caceee183d8af2118ddbee02c70a" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Jul 11 22:12:16 2011 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Jul 11 22:12:16 2011 -0700" }, "message": "Remove the simulator target from all makefiles.\nBug: 5010576\n\nChange-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8\n" }, { "commit": "ab00df4d8585b181e9058eb1b9c7996aa3bbaeab", "tree": "5e60b07a24b05d9c667df5946facb3b20b7c9454", "parents": [ "6ef9a104959c1d15232fe3a319e4a270eed3ddb5" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Wed Jun 22 14:55:16 2011 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Wed Jun 22 16:36:24 2011 -0700" }, "message": "- Add two sanity checks.\n- Remove one unnecessary line.\n- Clear the extendedData vector in DecryptHandle.\n\nChange-Id: I2610c6d68f12d48cb69323a5eb2ae4b3b3e44dff\n" }, { "commit": "185a19319e61ccd5e8806b7d00a20192dbcaf1f8", "tree": "1980e1ce6a6cf8d98ddee830a20f312655b997ba", "parents": [ "fb6c6167c81c6ade0956d05924eebdeeec65d973", "409e5a07f044239aac2059c9ba3b3f6f48eeaba1" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Jun 21 13:19:36 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 21 13:19:36 2011 -0700" }, "message": "Merge \"Fix a memory leak in the Forward Lock plugin. For bug 4770217.\"" }, { "commit": "409e5a07f044239aac2059c9ba3b3f6f48eeaba1", "tree": "15cee992c66e03cc53d88ef507c95a23c5107d70", "parents": [ "50b0f02dea21f31ec1fbe45b86893aa9233483b8" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Jun 21 11:07:59 2011 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Jun 21 11:07:59 2011 -0700" }, "message": "Fix a memory leak in the Forward Lock plugin.\nFor bug 4770217.\n\nChange-Id: I14f4d4ead524c661e68a20738e7a50e4d8fd92ea\n" }, { "commit": "daeba2d6b9df5252afacec835a23340e5d9910ec", "tree": "f9444c2e3cbffed3691c5e4159b0b0ce2920bf8c", "parents": [ "01bded1246cd770b54b8011527f5c29e1b5663e3", "c10ce33302f91896fc2a87c13b00518a4bc26e3a" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Jun 16 10:23:04 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 16 10:23:04 2011 -0700" }, "message": "Merge \"-Fix some typo -Remove one unnecessary memory allocation\"" }, { "commit": "c10ce33302f91896fc2a87c13b00518a4bc26e3a", "tree": "6a83d35dc96348371134130cc25f08867a2adace", "parents": [ "6771263604cf8e464b5cd1278823b0898af3a2a9" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Wed Jun 15 10:27:52 2011 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Wed Jun 15 17:32:06 2011 -0700" }, "message": "-Fix some typo\n-Remove one unnecessary memory allocation\n\nChange-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f\n" }, { "commit": "b432603d711cd504d0de62f7fbb095b90c9a4283", "tree": "1940dd0c20ee6d0424a2f5d890e151d9573ae2fd", "parents": [ "6771263604cf8e464b5cd1278823b0898af3a2a9" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Jun 14 14:44:15 2011 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Jun 14 14:50:10 2011 -0700" }, "message": "To remove log spam in the Forward Lock DRM plugin.\nFix for bug 4619159.\n\nChange-Id: Id4984aade4cceb59a1fdf904949f62535decd2a4\n" }, { "commit": "50872c0b6563b75bb02e0de2fd578b40db8227db", "tree": "265629254ff8dccd23348ba2c9ef18cbcf68b243", "parents": [ "afcedc9e6f17d8213d9bd8f6c36643dcc816d0ef" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Jun 13 16:29:38 2011 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Jun 13 16:29:38 2011 -0700" }, "message": "Duplicated fileDesc is not closed when input file is not forward-lock content.\nFix for bug 4606053.\n\nChange-Id: I1b45457d8cdc75d268631911f46ce6ec931b1770\n" }, { "commit": "adfb5592622305090ad39dcc2b7df477736da2c6", "tree": "b343061612b7887cbb898fb53c0f9c407dea4450", "parents": [ "f8c45a90a69cec5041f6fb11a7e31af646e43d25" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sun Apr 24 12:38:35 2011 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Sun Apr 24 12:40:16 2011 -0700" }, "message": "Fix memory leak from retrieval of getSupportedDrmInfo.\n\nChange-Id: Ic2192a9791c0a3c5e5357b4367a2d8bfb15af20c\n" }, { "commit": "277360f06bdfefe821d4ddde8876f8e2507887c3", "tree": "5c9eeb0a89d523d8c7f729541e2de382f7d38646", "parents": [ "199b6924d11a48ca8383392e18ac0f2e58523f01", "504c5e3fa3d4378773bd76b045d7a2e1e834fe59" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Fri Mar 25 10:11:49 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 25 10:11:49 2011 -0700" }, "message": "am ed7b688c: am aac43ea1: am b8b85ea2: Merge \"Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.\" into honeycomb-mr1\n\n* commit \u0027ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3\u0027:\n Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.\n" }, { "commit": "25cd5788a70f45c807ad22aa0ecdc7e1d4d5fd67", "tree": "49a2fb6a70bf380524ad78133c59a1bbe43e1422", "parents": [ "07d0220bcc9036bcbe36819912559267d9c1c538" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Mar 24 13:14:02 2011 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Mar 24 13:14:02 2011 -0700" }, "message": "Fix for bug 4126624.\nChange the mDrmManagerClientImpl to sp to avoid double delete the pointer.\n\nChange-Id: I7aacea1bc58ab6425ef6f6f09472c6f2970ebb4d\n" }, { "commit": "07d0220bcc9036bcbe36819912559267d9c1c538", "tree": "b321b94e19eeca3423f8cf5e110e4206b70f483a", "parents": [ "eabd34665adc284525fe7337ad5c56a8b92964ef" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Wed Mar 23 22:35:13 2011 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Mar 24 10:30:57 2011 -0700" }, "message": "Fix for bug 4165823.\nAdd death listener to clean-up drmserver appropriately when drmserver died.\nCherry-pick from master. Do not merge.\n\nChange-Id: I7782cc96ce173a87ebfd315950f3880fa90294d6\n" }, { "commit": "4fed58a760e4b3e7c3ba703d9e34406ad09dd469", "tree": "1b8dea84d69faea801ad8091f6a2aafe796e5a67", "parents": [ "d7c1648e99ca1ca9c4b941aeefccd2feb55a649f", "21e7c33eaf8772819bf57fe9557885e4ebc43e1b" ], "author": { "name": "Carl Shapiro", "email": "cshapiro@google.com", "time": "Tue Mar 22 16:18:38 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Mar 22 16:18:38 2011 -0700" }, "message": "Merge \"Include strings.h for the strcasecmp prototype.\"" }, { "commit": "21e7c33eaf8772819bf57fe9557885e4ebc43e1b", "tree": "7ce9fa6fc031b84c14840c8d2fa9b33ad8e70157", "parents": [ "7b55c7ce1d8f187430d0b6bda68378f549930289" ], "author": { "name": "Carl Shapiro", "email": "cshapiro@google.com", "time": "Tue Mar 22 11:51:57 2011 -0700" }, "committer": { "name": "Carl Shapiro", "email": "cshapiro@google.com", "time": "Tue Mar 22 11:51:57 2011 -0700" }, "message": "Include strings.h for the strcasecmp prototype.\n\nChange-Id: I83cd464d59d16f1c5f8afa7e50d474ca2bb41713\n" }, { "commit": "0b500c2e81288190a6ce8b20c842a83a19e038b5", "tree": "fdd0862b605eddcc1b20ba98ac3d73e936dd5340", "parents": [ "245af5e9ecb1881aa0b05f73bdbd249ec49a2af1", "52bee301b7ef870ec0acd86fda72352508369ce6" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Mar 22 11:43:09 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 22 11:43:09 2011 -0700" }, "message": "am fc4c13be: am 01240177: am 3cc797b9: Merge \"Add one more field in DecryptHandle to support bug 4126624\" into honeycomb-mr1\n\n* commit \u0027fc4c13be8ce8c2d05432d855c2c61548abef3385\u0027:\n Add one more field in DecryptHandle to support bug 4126624\n" }, { "commit": "6b2a35bbec228ce012065260ba153ee894f17a4e", "tree": "b7877f5457bbb5885e7eea0213a5e4c9c6113612", "parents": [ "4dabc20fa21f78a0bc2f91f772ad449ac8b17028" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Mar 21 17:22:13 2011 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Mar 21 19:08:18 2011 -0700" }, "message": "Add one more field in DecryptHandle to support bug 4126624\n\nChange-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b\n" }, { "commit": "4dabc20fa21f78a0bc2f91f772ad449ac8b17028", "tree": "ba929cc3609584be4ca38abdcd807d80d0b6212f", "parents": [ "310962976d575c0a97ec7a768e9cca0b2361daea" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Mar 21 16:53:14 2011 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Mar 21 16:53:14 2011 -0700" }, "message": "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.\n\nChange-Id: If724de60bd6da1becdffc815d5358ffe78629469\n" }, { "commit": "1da9aa606096e14985924e8433a087d04f68ea22", "tree": "c1044319fcfc114f8459bb1abac1aa75c9e3d80f", "parents": [ "c8a8472a0205dd698c8d81bf7e09026ca1013d1e" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Sun Mar 20 10:25:16 2011 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Mar 21 13:50:04 2011 -0700" }, "message": "Fix for 4084554.\nDRM framework support for enabling/disabling copy control settings from a DRM plugin\n\nChange-Id: I6529695cc4adbab2b9a63708bb459e3b77e07564\n" }, { "commit": "79cbc13ede26d08ab6633a042843a9d154c3c166", "tree": "a8b76f1d3645ae4ca581415b9f4b34b8e0aa2765", "parents": [ "c901f74404435cc1cf2717016e2b0092b6dcea24" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Mar 17 15:02:34 2011 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Mar 17 15:02:34 2011 -0700" }, "message": "Fix for bug 4126103.\nmMessage in DrmInfoEvent is a reference to the message string, so the\ntemporary message created in the plugin was going out of scope and\nbeing destructed while the message was being sent. Changed DrmInfoEvent\u0027s\nmMessage to be const String8 instead of const String8\u0026\n\nChange-Id: I174197ad24f3df997d3bc1f897658cfc53862636\n" }, { "commit": "1006c80903c4e6b0554a3bc2e3585639c395927d", "tree": "f024dd66dba1d170242cff661ad3b7035a1bbe59", "parents": [ "99b1c9861c7cc1ee3c750b95ad823ad6a4dcfe65", "8d2577b9ac2f95f218db59a78447efd3c6a742dd" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Mar 15 14:10:30 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Mar 15 14:10:30 2011 -0700" }, "message": "Merge \"Bug fixes of DRM framework.\"" } ], "next": "99b1c9861c7cc1ee3c750b95ad823ad6a4dcfe65" }