1. 1a22cbd Merge "Avoid checking supported mime types or file suffixes in multiple places" by James Dong · 13 years ago
  2. 4f1ed0e Avoid checking supported mime types or file suffixes in multiple places by James Dong · 13 years ago
  3. 8623390 Added an failure log message when the fwdlock engine fails to open a given file. by James Dong · 13 years ago
  4. 9864b25 There was copy and paste code in JNI to create a DrmConvertedStatus object. by James Dong · 13 years ago
  5. f16a272 Fix some JNI issues in the drm framework by James Dong · 13 years ago
  6. e43dadf Merge "Fixes to DrmConvertedStatus, DrmInfoStatus, and DrmSupportInfo classes" by James Dong · 13 years ago
  7. 7edb9a9 am f73222a3: am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources" by Jean-Baptiste Queru · 13 years ago
  8. 52cb1e598 Fixes to DrmConvertedStatus, DrmInfoStatus, and DrmSupportInfo classes by James Dong · 13 years ago
  9. 6225df0 DRM framwork bug fix: add an API to release resources by Kei Takahashi · 13 years ago
  10. 5df6280 Added permission check for all sensitive drm API calls by James Dong · 13 years ago
  11. 2f16d7e Merge "Fix API issues in DrmRights class." by James Dong · 13 years ago
  12. e512ad5 Merge "Deprecate default constructor for classes that should have been meant to be interfaces" by James Dong · 13 years ago
  13. 31db8b9 Merge "Remove unnecessary header file includes for drmserver" by James Dong · 13 years ago
  14. da5ac93 Merge "Added missing javadoc comment for public API in DrmUtils class" by James Dong · 13 years ago
  15. f7a68fc Added missing javadoc comment for public API in DrmUtils class by James Dong · 13 years ago
  16. a3a9d6e Remove unnecessary header file includes for drmserver by James Dong · 13 years ago
  17. 5cb68c8 Fix API issues in DrmRights class. by James Dong · 13 years ago
  18. c4a9976 Deprecated a mis-spelled method and replaced it with a new method by James Dong · 13 years ago
  19. 060526f Deprecate default constructor for classes that should have been meant to be interfaces by James Dong · 13 years ago
  20. b7956de Merge "Improved comment about DrmStore.ConstraintsColumns" by James Dong · 13 years ago
  21. e82f055 Only allow valid types to be used in DrmErrorEvent and DrmInfoEvent by James Dong · 13 years ago
  22. 365ce1d Improved comment about DrmStore.ConstraintsColumns by James Dong · 13 years ago
  23. 6c95d4f Added checks for illegal arguments by James Dong · 13 years ago
  24. c6aacce Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) by Steve Block · 13 years ago
  25. a51f0e7 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) by Steve Block · 13 years ago
  26. 933e856 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) by Steve Block · 13 years ago
  27. 1afd5ba Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) by Steve Block · 13 years ago
  28. 06ade6a Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) by Steve Block · 13 years ago
  29. d1ba6ed Separate sniffing from session initialization by James Dong · 13 years ago
  30. 3762c31 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE by Steve Block · 13 years ago
  31. 8564c8d Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE by Steve Block · 13 years ago
  32. 5baa3a6 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE by Steve Block · 13 years ago
  33. 29e97f1 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. by James Dong · 13 years ago
  34. d70c64d Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck by James Dong · 13 years ago
  35. b34027b am f14dc291: Merge from ics-mr1 by The Android Open Source Project · 13 years ago
  36. a5cbf02 Fix drm enumeration order, resolves failure to play forward lock ringtones by Jeff Tinker · 13 years ago
  37. 9122518 Fix log message by Glenn Kasten · 13 years ago
  38. 71f2cf1 Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE by Steve Block · 13 years ago
  39. aab6fe2 Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded. by Edwin Wong · 13 years ago
  40. 09337a0 resolved conflicts for merge of 845fdba7 to master by Gloria Wang · 13 years ago
  41. 845fdba am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent" by Gloria Wang · 13 years ago
  42. 93827fb Bug fixes in OMA DRM v1 Forward Lock Agent by Henrik B Andersson · 14 years ago
  43. 601a90c Fix ordering assumption of argument evaluation. by Gloria Wang · 13 years ago
  44. a17d454 Fix for bug 4371230. by Gloria Wang · 13 years ago
  45. bd882b1 Remove the simulator target from all makefiles. Bug: 5010576 by Jeff Brown · 13 years ago
  46. b7e7bdf - Add two sanity checks. by Gloria Wang · 13 years ago
  47. 93aa58f Merge "Fix a memory leak in the Forward Lock plugin. For bug 4770217." by Gloria Wang · 13 years ago
  48. 7bafb97 Fix a memory leak in the Forward Lock plugin. For bug 4770217. by Gloria Wang · 13 years ago
  49. 464c120 Merge "-Fix some typo -Remove one unnecessary memory allocation" by Gloria Wang · 14 years ago
  50. 2980a21 -Fix some typo -Remove one unnecessary memory allocation by Gloria Wang · 14 years ago
  51. 8b554f3 To remove log spam in the Forward Lock DRM plugin. Fix for bug 4619159. by Gloria Wang · 14 years ago
  52. cbe0d94 Duplicated fileDesc is not closed when input file is not forward-lock content. by Gloria Wang · 14 years ago
  53. 3f0341c Fix memory leak from retrieval of getSupportedDrmInfo. by James Dong · 14 years ago
  54. 503b111 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 by Gloria Wang · 14 years ago
  55. 4c87a75 Fix for bug 4126624. by Gloria Wang · 14 years ago
  56. 9e1e9a3 Fix for bug 4165823. by Gloria Wang · 14 years ago
  57. f46821b am 640f63c2: am 3bde4594: am 0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1 by Bill Gruber · 14 years ago
  58. 0357ec7 Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1 by Bill Gruber · 14 years ago
  59. 0e092f8 DRM API doc scrub by Bill Gruber · 14 years ago
  60. 5c62d99 Merge "Include strings.h for the strcasecmp prototype." by Carl Shapiro · 14 years ago
  61. 39ad826 Include strings.h for the strcasecmp prototype. by Carl Shapiro · 14 years ago
  62. 66044c1 am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1 by Gloria Wang · 14 years ago
  63. c430394 Add one more field in DecryptHandle to support bug 4126624 by Gloria Wang · 14 years ago
  64. ee4084b do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624. by Gloria Wang · 14 years ago
  65. 3bbeaac Fix for 4084554. by Gloria Wang · 14 years ago
  66. cfbe436 Fix for bug 4126103. by Gloria Wang · 14 years ago
  67. 454b2d1 am 2c3257b2: am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 by Gloria Wang · 14 years ago
  68. f8bf3c4 Fix for 4089881. by Gloria Wang · 14 years ago
  69. 0e5e2e2 Merge "Bug fixes of DRM framework." by Gloria Wang · 14 years ago
  70. e5eb43b am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1 by Glenn Kasten · 14 years ago
  71. 4528a7d Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1 by Glenn Kasten · 14 years ago
  72. 5c96c65 Bug fixes of DRM framework. by Gloria Wang · 14 years ago
  73. ed73246 Add memory leak tracking/debugging code to drm server by James Dong · 14 years ago
  74. f8a1842 Bug 4016329 do full string comparisons by Glenn Kasten · 14 years ago
  75. 5c4421f am 67718e07: am 132bb659: Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1 by Gloria Wang · 14 years ago
  76. 27b2777 For issue 4082089 Add more info and error events into the DRM framework by Gloria Wang · 14 years ago
  77. 3070af0 frameworks/base: remove LOCAL_PRELINK_MODULE by Iliyan Malchev · 14 years ago
  78. 09ba5ce resolved conflicts for merge of c761a80d to master by Gloria Wang · 14 years ago
  79. 192b591 - Some change on the DrmManager in order to support feature request 4082089. by Gloria Wang · 14 years ago
  80. ae77527 Fix for bug 3477330 by Gloria Wang · 14 years ago
  81. 54fe585 Merge "- Change level of some LOGs from LOGE to LOGV because those logs are not error logs from non-DRMed content's point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039" into honeycomb-mr1 by Gloria Wang · 14 years ago
  82. 2ef2d49 - Change level of some LOGs from LOGE to LOGV because those logs by Gloria Wang · 14 years ago
  83. b8b6a9a To support uri started with http:// in some Java APIs Fix for bug 4016388. by Gloria Wang · 14 years ago
  84. 6c1bebe Merge "Do not call processDrmInfo if acquireDrmInfo returns null" by Gloria Wang · 14 years ago
  85. 4ef690a Do not call processDrmInfo if acquireDrmInfo returns null by Gloria Wang · 14 years ago
  86. 289401b To support DRM files without file extension by Gloria Wang · 14 years ago
  87. e8c89a3 Move all Widevine code which have dependency on vendor modules to vendor/widevine by Gloria Wang · 14 years ago
  88. 6681984 - Update from Widevine - Bug fixes by Gloria Wang · 14 years ago
  89. 33fdd1c Bug 3361124 Remove drmioserver, continued by Glenn Kasten · 14 years ago
  90. e9b467d Bug 3361124 Remove drmioserver by Glenn Kasten · 14 years ago
  91. 3bf37ac am 113529f0: am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb by Gloria Wang · 14 years ago
  92. 113529f am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb by Gloria Wang · 14 years ago
  93. d0423d2 More fix for 64 bit offset. by Gloria Wang · 14 years ago
  94. 7a5321d rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/ by Gloria Wang · 14 years ago
  95. c89d319 am c35b3268: am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution" by Gloria Wang · 14 years ago
  96. c35b326 am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution" by Gloria Wang · 14 years ago
  97. a220a29 Merge "Initial OMA DRM forward lock contribution" by Gloria Wang · 14 years ago
  98. 70e8d9c Merge "Bug 3229711" by Glenn Kasten · 14 years ago
  99. cbba720 Bug 3229711 by Glenn Kasten · 14 years ago
  100. 3b7983c am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes." by Gloria Wang · 14 years ago