)]}' { "log": [ { "commit": "81e1c008520d77adb180f5f58f5ed34b38dabaf7", "tree": "78df0ce9e680a06bbc567567d95a10ab111ea607", "parents": [ "a8129f7246dfb580158a002d06492c699183101c" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Wed Nov 20 06:12:58 2019 -0800" }, "committer": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Wed Nov 20 06:15:15 2019 -0800" }, "message": "Revert \"DecryptHandle cleanup\"\n\nThis reverts commit e75d74c70f125bddeb36e175de77e3b0461d1e48.\n\nTest: Local build completes\nBug: 144814133\n" }, { "commit": "e75d74c70f125bddeb36e175de77e3b0461d1e48", "tree": "046998455cb57700e99e614c21ad7e3771519021", "parents": [ "bc0d257bbe16df642b8c75510e2d59665c46dfe4" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Nov 14 08:33:58 2019 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Nov 19 14:47:48 2019 -0800" }, "message": "DecryptHandle cleanup\n\nRemove copyControlVector, extendedData and decryptInfo from DecryptHandle,\nsince none of these were actually used.\n\nTest: atest cts/tests/tests/drm/src/android/drm/cts/DRMTest.java\nChange-Id: I499bf4884e467b53d05e1317e3dbe0bd85537577\n" }, { "commit": "5d49bef8000500556743af66b669ae7e18ac85b5", "tree": "31c26fd42fb436101e8e57bcc51efe355abde9a6", "parents": [ "5e0659c82240821cfa6766d33cca438a5f09ef32" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Oct 03 23:01:09 2018 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Oct 05 15:58:26 2018 -0700" }, "message": "openDecryptSession() should consistently return sp\u003cDecryptHandle\u003e\n\nTest:run cts-dev --module CtsDrmTestCases -t android.drm.cts.DRMTest\n\nbug:79378662\nChange-Id: Id46e63e3e0faf76ec98a77d7d439e5ccbc85e20f\n" }, { "commit": "f64686f3b8c5100e114974038d0b2bb215d9bcd9", "tree": "c98f9a492583996ed4b134baa258d1909f2b06f0", "parents": [ "276b60e1be8ed92149411240d95705c642c7531a", "5405ce02c45b55c0ba12fd3131ae329506e91f94" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Thu May 19 19:12:38 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 19 19:12:38 2016 +0000" }, "message": "Merge \"Fix misc-macro-parentheses warnings.\" am: 64d4f64af0\nam: 5405ce02c4\n\n* commit \u00275405ce02c45b55c0ba12fd3131ae329506e91f94\u0027:\n Fix misc-macro-parentheses warnings.\n\nChange-Id: I94cd974549d819d7a43733636ecd4a6e464b76eb\n" }, { "commit": "92c6b825ad27e790b5ebd7076bd9b9ef3d5815ce", "tree": "5387cdb9c95cece74df22fc6485dfea62e0c3a3d", "parents": [ "0603c5dfc34923095218307674a60429bfa5873a" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Tue May 17 15:20:14 2016 -0700" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Tue May 17 15:20:14 2016 -0700" }, "message": "Fix misc-macro-parentheses warnings.\n\nBug: 28705665\nChange-Id: I1ad468741c6f117817099d2ba87374dce2b776a9\n" }, { "commit": "2b7561f802bac06981dc46867d959e627085a8f7", "tree": "facf61edf27a99181794dd75081962c855d37b86", "parents": [ "172b675b5b24988e90ae39a0d6811789e06f7b74" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Apr 01 09:21:52 2016 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Apr 01 09:21:52 2016 -0700" }, "message": "Update how drm file descriptors are passed through framework\n\nbug: 26422357\nChange-Id: I1df2d08d432c17c703823617ee10dc181a9b9df7\n" }, { "commit": "2151d8f9ae667c53749e81a93f0ec0c60f3b8e05", "tree": "307f10d5342c2fcf823920ca7e0af2a38ee135f8", "parents": [ "3662ca1098676ed254dae8ffc014d60311d31b7e", "78f7932ddd8fed44a8fb421fcbf31f4ec1a82713" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Sep 21 21:30:09 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 21 21:30:09 2015 +0000" }, "message": "am 78f7932d: am 7b642b08: am 0af50080: am 8ba28c84: am d61dbb36: am 38281f1c: am d386c5be: Merge \"Fix heap data leak vulnerability\" into klp-dev\n\n* commit \u002778f7932ddd8fed44a8fb421fcbf31f4ec1a82713\u0027:\n Fix heap data leak vulnerability\n" }, { "commit": "78f7932ddd8fed44a8fb421fcbf31f4ec1a82713", "tree": "542a1f5c482f6997eacda70ba5ce8da7f55f7c2e", "parents": [ "d1cd259108cdc4abc192cb250ab15d03d3b76d96", "7b642b085413ffd92caa07933b21bc00b55f9905" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Sep 21 21:06:45 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 21 21:06:45 2015 +0000" }, "message": "am 7b642b08: am 0af50080: am 8ba28c84: am d61dbb36: am 38281f1c: am d386c5be: Merge \"Fix heap data leak vulnerability\" into klp-dev\n\n* commit \u00277b642b085413ffd92caa07933b21bc00b55f9905\u0027:\n Fix heap data leak vulnerability\n" }, { "commit": "09ed70fab1f1424971ccc105dcdf5be5ce2e2643", "tree": "7cba0792014f79748c0fcc7c950cb4d6cc963403", "parents": [ "13ff64c2db84f4e7cac3396700e333b48c42c7ee" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Sep 14 13:55:23 2015 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Sep 14 13:55:23 2015 -0700" }, "message": "Fix heap data leak vulnerability\n\nbug: 23600291\nChange-Id: I7979e9e25ada01c13775be8580d433a8b4ce4ffe\n" }, { "commit": "b408fa26c782c57272f11b46a235cca8c9ccb9be", "tree": "f3d7005298447009bcc2eb3b74c83221bc6feea4", "parents": [ "4275065e89b121fd2f9bd4e0440577348d5ce663" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Apr 28 16:42:20 2015 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Apr 29 16:26:19 2015 -0700" }, "message": "Harden drmserver process against fuzzing attacks\n\nbug: 19572107\nChange-Id: I5ba0a434b016e8dc376f7d0eef5cf76b99ab50fd\n" }, { "commit": "f888020c6e2735624f2b2a30e72aca24e17b8b4d", "tree": "76d92b7a91a4bebd4e84d6afdc2ef4a2e4943df8", "parents": [ "d02641098b16df2fd4cd32b72a30eb6f3b64e12b" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 14 07:58:25 2014 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Nov 17 10:05:07 2014 -0800" }, "message": "Update calls to IInterface::asBinder()\n\nto use the new static version.\n\nChange-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a\n\nConflicts:\n\tmedia/libmedia/IAudioFlinger.cpp\n\tmedia/libmedia/IMediaPlayer.cpp\n\tmedia/libstagefright/CameraSource.cpp\n" }, { "commit": "06b46062d2f8bc82ca3061a23d197734ae51918b", "tree": "3aee1330c3d65579643e50d105da35919ddc295f", "parents": [ "e5a9eb684921b75919b1a7fee97259b0ca48bd47" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 14 07:58:25 2014 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 14 14:01:03 2014 -0800" }, "message": "Update calls to IInterface::asBinder()\n\nto use the new static version.\n\nChange-Id: I89a5988a0ac694ffc04d88cf939e8455bf925d4c\n" }, { "commit": "12604519328867f11511b967565607971234c0ab", "tree": "bc2eb096fa3229d8be7b3ea902588ed299a09b27", "parents": [ "14fc930d5d2ef272b39342fa083f4097464fc9ea" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Tue Sep 16 17:36:55 2014 -0700" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Tue Sep 16 17:36:55 2014 -0700" }, "message": "Check for NULL before calling asBinder().\n\nThe old asBinder() checked if this \u003d\u003d NULL, which is undefined behavior.\n\nChange-Id: Ibde628395ca10dfef0d2f59e81280576f104b83c\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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "6b610a3d31a225adfc5867223df25dba16637bd9", "tree": "76e9cebbc53f536838cbf5502d1cbc1649f64a12", "parents": [ "4f46fed004b76d462ef859aa94a3c056b0e79b60" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Fri Mar 04 14:45:03 2011 -0800" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Wed Mar 09 15:51:46 2011 -0800" }, "message": "- Change level of some LOGs from LOGE to LOGV because those logs\n are not error logs from non-DRMed content\u0027s point of view.\n- Add more mutex lock to avoid crash by multi-thread calls.\n- Fix for bug 4050039\n\nChange-Id: I52fed22069f0cda6c4ac6a5363469168c797a33b\n" }, { "commit": "2ed8a921ef55aa2f3dd4b7ac33b7ded6ec33d92d", "tree": "df7cad524492b9f7f54daddd99bf1626ba89bed4", "parents": [ "886c09ee81eb7b8878e487c7f801ea8ddb27c17c" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Wed Jan 19 15:38:16 2011 -0800" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Wed Jan 19 15:38:16 2011 -0800" }, "message": "More fix for 64 bit offset.\n\nChange-Id: Ia05060113ca0f43a4362914dc99c89c89e30eb4a\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": "b251f75d5ca3fa19cfe8a284717e00dec31f18ea", "tree": "edb48bc69001ca3ef96bf072d71441bc8a60d547", "parents": [ "bf3122eed31cd24acdf5cfd25541db0beb77e6f0", "3041096d137144d9d1ebdd6df88ebe8e85133c05" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Wed Nov 03 11:39:04 2010 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Wed Nov 03 11:39:04 2010 -0700" }, "message": "resolved conflicts for merge of a8d7b747 to master\n\nChange-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349\n" }, { "commit": "5a6d1487905df5ea28168bd907aae93c0688dadf", "tree": "7da155569dc2461439f257f750fff5432f023a40", "parents": [ "02a1db7dc1de2f2df306ec10bab992bc8bbaaca8" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Nov 02 15:02:48 2010 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Nov 02 15:09:43 2010 -0700" }, "message": "Disable some logs\n\nChange-Id: I05fcf6869916504367814fd2abd2b1af88619f5b\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" } ] }