)]}' { "log": [ { "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": "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": "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": "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": "1825ce2475d4cbed336ddb779ab5acb09d9a155c", "tree": "229089e703ee58a77790038ac5de28a3e0581296", "parents": [ "8b9a9067511efca72ca872d689e30315c1450f94", "6cfa41f06fc6a85ebaf5b94c4602128359587473" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Mar 14 11:56:39 2011 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Mar 14 11:56:39 2011 -0700" }, "message": "resolved conflicts for merge of c761a80d to master\n\nChange-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c\n" }, { "commit": "0e0a5f9e0b7a7ca618e8a1f7ccecc57a17e0d1e2", "tree": "8ad3203ba726da5b28d63f25d16c1c761cc97885", "parents": [ "2eb62955eb84b97695e8a7e56e14310cbb86412b" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Fri Mar 11 14:07:21 2011 -0800" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Fri Mar 11 14:54:23 2011 -0800" }, "message": "- Some change on the DrmManager in order to support feature request 4082089.\n In DrmManager, we currently lock both processDrmInfo() and onInfo() which is\n ok for now since processDrmInfo() is async call, and it will return without\n waiting for onInfo() call. However, if we send an event in processDrmInfo(),\n we will got deadlock here because we need to invoke onInf() which will wait\n for processDrmInfo() to release the lock. Use different lock for onInfo().\n- Remove some redundent mutex lock.\n\nChange-Id: I59c794f95ba1693425723224114fa975cf9b235f\n" }, { "commit": "b5ce361d19e69fe156f7188c9ee0f4734b259874", "tree": "1536e63d3394cbbd5c2e8bc5cde6affb2b173850", "parents": [ "609ce04d29780c430ff7e17511fc073a664c02d5" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Feb 24 16:40:57 2011 -0800" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Mar 10 16:20:48 2011 -0800" }, "message": "Fix for bug 3477330\nThis patch fixs a crash bug caused by using a NULL DecryptHandle pointer.\nFix by using sp\u003cDecryptHandle\u003e instead.\n\nChange-Id: Icbd59858385e8256125a615a3c82656b25319d44\n" }, { "commit": "ac2652c25f5d2a38709131f7731651bc5819fed5", "tree": "d8c86badbc1e53832fe2e3cf41f7970843c3f471", "parents": [ "b03f5627d4e0d80ea7b185e0af1d8a5d19461325", "9cfc9eff42a0700029c39e89c38b52488845ad63" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Jan 11 14:55:56 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 11 14:55:56 2011 -0800" }, "message": "am 9e0bb6d5: am 0544d059: Merge \"DRM Framework bug fixes.\"\n\n* commit \u00279e0bb6d5eef5dfe2da60c50f3aaa39512307d11d\u0027:\n DRM Framework bug fixes.\n" }, { "commit": "c618b5af98dec06d49374a61a5a94016f9fec2d3", "tree": "a33e45ff0d2cd56b47da6fced34e898950ca08b2", "parents": [ "c533edc9c70dd9434e2e496dc0d52f534472c7e0" ], "author": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Tue Nov 30 16:27:42 2010 +0900" }, "committer": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Tue Nov 30 16:27:42 2010 +0900" }, "message": "DRM Framework bug fixes.\n\n- Make sure to clean-up obsolete listeners.\n- Close cursor after using it.\n- Add virtual destructor to the base class of OnInfoListener.\n\nChanges are made by SEMC and Sony.\n\nChange-Id: Ibb6dd625ef48e3597188f0d7c90f9d4c780b6139\n" }, { "commit": "6dc4726e7fa14e4006f6790c6f1ba02cfe888870", "tree": "5162c29866b9b737bc3808fd196e437d8cf0c0e1", "parents": [ "321b630783709eeb18952c3408303489db4ea9eb", "f798e438c3997fd3fb39538bf3e958cfdc7a477c" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Nov 22 21:29:08 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 22 21:29:08 2010 -0800" }, "message": "am 24a90c26: am d9334934: Merge \"Update of DRM Framework.\"\n\n* commit \u002724a90c2674270fee0783bafa54fd5d845bdf0c18\u0027:\n Update of DRM Framework.\n" }, { "commit": "a2cd44cb5067b4fe98794860690394254d3ac73c", "tree": "08a581d8684a550faa9f5cb76dc5cab96e641f81", "parents": [ "c726bd8b7b9929fd917b01e5551a66ad5fe2c04e" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Fri Nov 19 15:19:36 2010 -0800" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Fri Nov 19 15:52:32 2010 -0800" }, "message": "64-bit file size/offset support for DRM framework\n\nChange-Id: I0ba7147607825234df9fa28732e1bba344e82e79\n" }, { "commit": "3473846f64f5b28e1cbeb70ef5867073fc93159e", "tree": "9651de1dd360d8d77d9d4a53a23ed1181845b93c", "parents": [ "cf6a8d23345a6e54834e53b1eb7e465f3cb5e914" ], "author": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Tue Nov 16 13:56:11 2010 +0900" }, "committer": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Fri Nov 19 22:02:51 2010 +0900" }, "message": "Update of DRM Framework.\n\n-Access permission handling\n Introduce an internal function which allows the desired process to\n access decryption flow. This new function is just for reference and\n each OEM manufacturer should implement/replace with their solutions.\n-New API, getMetadata()\n This API is for retrieving media metadata from container-based DRM,\n such as OMA forward-lock content. This API asks DRM agent to retrieve\n media metadata hiddein inside of DRM special container.\n-New API, acquireRights()\n This API wraps acquireDrmInfo() and processDrmInfo().\n If DRM agent has valid implementation of both APIs,\n Application can acquire DrmRights only by calling this API.\n-Bug fix in event loop of OnInfoListener.\n Separate OnInfo event loop from mail thread loop so as to avoid\n the issue that message is not dispatched when mail thread is busy.\n\nChanges are made by SEMC and Sony.\n\nChange-Id: I04ee3e0988152a71e221f2256d83253749a29da0\n" }, { "commit": "e943f84129326ab885cc7a69dcfa17f766b72b89", "tree": "45602605772fcd85d240cbfd900b82e0067453e9", "parents": [ "dcd25efb46c41c8d24a0a9cf61fb57f84149709e" ], "author": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Fri Oct 08 23:05:49 2010 +0900" }, "committer": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Tue Nov 02 08:06:06 2010 +0900" }, "message": "Update of DRM framework\n\n - Overload openDecryptSession() with uri parameter\n in order to accept URI of DRM content,\n Following API is added,\n DecryptHandle*openDecryptSession(const char* uri);.\n - Unify texisting three event types of processDrmInfo()\n so that caller of DRM framework does not have to handle many event types.\n - Let DrmManagerService call load/unload plugins API so that\n client of DRM framework does not have to manage plug-in load/unload.\n - Trivial fix in DrmManagerClient.java is also incorporated.\n\nChanges are made by Sony Corporation.\n\nChange-Id: If62b47fa0360718fdc943e6e6143671d7db26adc\n" }, { "commit": "2272ee27d9022d173b6eab45c409b3c3f57f30ec", "tree": "42fd86597781bdf6b3795907ec1d086b0b549a5c", "parents": [ "0335b70c6cdbe96650d4bed817f9233cd8db1c6d" ], "author": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Mon Sep 20 23:40:41 2010 +0900" }, "committer": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Mon Oct 04 22:14:53 2010 +0900" }, "message": "Update of DRM framework.\n\n - Change \"void\" type of return value to \"int\" for returning status.\n - Add some of overloaded Java APIs which accept database Uri as input.\n - Add asynchronous APIs\n - Add OnEventListener and OnErrorListener for asynchronous APIs\n - Disable debug log\n - Change decrypt() API to accept an optional buffer needed by some of DRM schemes\n\nChanges are incorporated by Sony Corporation.\n\nChange-Id: I414a165e22cc79be6ea7cd28041788aa2b6b8f7c\n" }, { "commit": "27ed8ad2db653f6ac07dcf8bcc05e2409c8bb024", "tree": "fa6b8100202640a8b9aec4b90271984f8e2c4336", "parents": [ "f1a97e53a58f47afa17a9b0d3a5cc9abf7e5ed19" ], "author": { "name": "aimitakeshi", "email": "aimitakeshi@gmail.com", "time": "Thu Jul 29 10:12:27 2010 +0900" }, "committer": { "name": "aimitakeshi", "email": "aimitakeshi@gmail.com", "time": "Wed Sep 01 15:40:00 2010 +0900" }, "message": " Initial contribution from Sony Corporation.\n\n Add DRM Framework to support DRM content playback\n together with StageFright.\n\n - DRM Framework code is added\n - include/drm\n - drm\n - api/current.xml is updated to include DRM Framework Java APIs\n - cmds/servicemanager/service_manager.c is modified\n to add drmManager and drmIOService.\n\nChange-Id: I6d7bc9c7067362b500e530988a9ce241761866fb\n" } ] }