drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
68,587 Commits 1 Branch 0 Tags
Commit Graph

105 Commits

Author SHA1 Message Date
James Dong
5df6280557 Added permission check for all sensitive drm API calls 
o all drm calls using a DecryptHandle now check the permission before proceeding

Change-Id: Ic992a991357876c6e4bfbfab4f5eec1fa0634a13
 2012-02-28 18:50:44 -08:00
James Dong
2f16d7eae1 Merge "Fix API issues in DrmRights class." 2012-02-28 14:34:02 -08:00
James Dong
e512ad5089 Merge "Deprecate default constructor for classes that should have been meant to be interfaces" 2012-02-28 14:33:19 -08:00
James Dong
31db8b9f6b Merge "Remove unnecessary header file includes for drmserver" 2012-02-28 13:09:44 -08:00
James Dong
da5ac93b00 Merge "Added missing javadoc comment for public API in DrmUtils class" 2012-02-28 13:09:24 -08:00
James Dong
f7a68fc985 Added missing javadoc comment for public API in DrmUtils class 
o also fixed mis-spelled private method name (quiteDispose => quietlyDispose)

Change-Id: I692cd7471eac547b849dd53853f60843b3915750
 2012-02-27 22:46:02 -08:00
James Dong
a3a9d6e746 Remove unnecessary header file includes for drmserver 
Change-Id: I14033861e74d20f9d4897b651c4eeee126d4d610
 2012-02-27 22:26:48 -08:00
James Dong
5cb68c86cc Fix API issues in DrmRights class. 
o account id and subscription id are not mandatory, and thus can be anything
  such as null or an empty string.
o removed unnecessary or thus inconsistent checks for account id and subscription id
o updated the javadoc to specify that mimeType could not be null or an empty string.

Change-Id: I704f1dd7fc5d33060da908aae0469d560c7db036
 2012-02-27 18:34:04 -08:00
James Dong
c4a9976aa1 Deprecated a mis-spelled method and replaced it with a new method 
Change-Id: Id049a4effab120c3f837cde60a87efcd89a64ec6
 2012-02-27 18:25:31 -08:00
James Dong
060526f985 Deprecate default constructor for classes that should have been meant to be interfaces 
o We should have not exposed these default constructors in the first place.

Change-Id: Ia8bcfe77e9730021ad8870ece67c6d0eed8146ad
 2012-02-27 18:00:12 -08:00
James Dong
b7956de3a9 Merge "Improved comment about DrmStore.ConstraintsColumns" 2012-02-24 16:36:34 -08:00
James Dong
e82f055e3e Only allow valid types to be used in DrmErrorEvent and DrmInfoEvent 
o This patch will prevent applications from abusing the API by using
  arbitrary int value for DrmErrorEvent or DrmInfoEvent types.
o We should have not defined some type constants in the super/base
  class, DrmEvent.

Change-Id: Id0bb12caa8ce471cb6951cc2b5d37ea408f90063
 2012-02-24 15:50:41 -08:00
James Dong
365ce1db33 Improved comment about DrmStore.ConstraintsColumns 
Change-Id: I89c588759dd409ac0252d686af12bfe4e105f3d5
 2012-02-23 10:58:55 -08:00
James Dong
6c95d4ff16 Added checks for illegal arguments 
Change-Id: Ib386c33b7e2cab12cabbb9dc023d54df05472960
 2012-02-15 11:30:51 -08:00
James Dong
d1ba6ed945 Separate sniffing from session initialization 
This avoid lengthy/duplicate sniffing for drm plugins when a decrypt session is opened

o The change is backward compatibile in that no update is required
  for existing drm plug-ins if they do not plan to provide separate
  sniffer/extractor

related-to-bug: 5725548

Change-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c
 2012-01-12 16:25:12 -08:00
Steve Block
3762c31172 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
 2012-01-08 13:19:13 +00:00
Steve Block
8564c8da81 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
 2012-01-06 10:07:54 +00:00
Steve Block
5baa3a62a9 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
 2012-01-03 22:38:27 +00:00
James Dong
29e97f169d 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. 
* commit '3f6a7d1ee961a4544563932b7499535dc1cac1ec':
  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.
 2011-12-14 13:53:31 -08:00
James Dong
d70c64db9f 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.

2. Revert "Fixed the false drm recognition."
   This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230.

3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones"
   This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369.

4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long."
   This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9.

As a result of the reverting, many ANRs from WV sniffing are back.

related-to-bug: 5739618
 2011-12-14 11:01:59 -08:00
The Android Open Source Project
b34027bb2f am f14dc291: Merge from ics-mr1 
* commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1':
  Fix drm enumeration order, resolves failure to play forward lock ringtones
 2011-12-12 15:39:17 -08:00
Jeff Tinker
a5cbf023e3 Fix drm enumeration order, resolves failure to play forward lock ringtones 
Change-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9
related-to-bug: 5735466
 2011-12-09 20:04:17 -08:00
Glenn Kasten
91225183d6 Fix log message 
Log did not have a tag, and was wrong level

Change-Id: I8d12895c80483e1e39f117a393b8be2f4bdd3e1d
 2011-11-10 14:58:44 -08:00
Steve Block
71f2cf116a Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
 2011-10-26 09:57:54 +01:00
Edwin Wong
aab6fe21df Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded. 
BUG: 5284436

Change-Id: I99267c81a488860c3c7edb747100d44f3083bfc2
 2011-09-21 21:50:31 -07:00
Gloria Wang
09337a07fa resolved conflicts for merge of 845fdba7 to master 
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
 2011-08-04 15:13:14 -07:00
Gloria Wang
845fdba7b5 am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent" 
* commit '8a6fb50d69ec40a413b117bc9145a97ec427852f':
  Bug fixes in OMA DRM v1 Forward Lock Agent
 2011-08-04 14:47:43 -07:00
Henrik B Andersson
93827fb09e Bug fixes in OMA DRM v1 Forward Lock Agent 
A couple of fixes in the Forward Lock Agent.
The DRM Framework isn't thread safe so the Forward Lock Agent needs
to protect the private structures.
Base64-encoded content with LF-only instead of CRLF line breaks is now
accepted.
A fix for non-standard boundary characters.
The debug prints are also turned off as default.

Change-Id: I8ab417231380fbe1c371d18a147773ceabc6f69f
 2011-08-04 13:43:02 +02:00
Gloria Wang
601a90c38a Fix ordering assumption of argument evaluation. 
No specific order is specified in the C++ standard, but the order of
the calls to Parcel read commands matters.  Move any calls with multiple
reads to local variables.

Fix for bug 5103507.

Change-Id: Ic23ad50ec5f443146f00324b66d5e2bd5b9ffd0d
 2011-08-01 10:52:49 -07:00
Gloria Wang
a17d454fd0 Fix for bug 4371230. 
- Generate unique ID for each DrmManagerClient in native side
- Fix the bug where multiple clients could use the same ID
- Return the correct unique ID back to Java
- Add a flag in the unique ID to separate native client and Java client

Change-Id: Ia4574b6b0a526f2335a65380975dc62f9a6e7f9b
 2011-07-25 16:09:58 -07:00
Jeff Brown
bd882b1c87 Remove the simulator target from all makefiles. 
Bug: 5010576

Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
 2011-07-11 22:12:16 -07:00
Gloria Wang
b7e7bdfe78 - Add two sanity checks. 
- Remove one unnecessary line.
- Clear the extendedData vector in DecryptHandle.

Change-Id: I2610c6d68f12d48cb69323a5eb2ae4b3b3e44dff
 2011-06-22 16:36:24 -07:00
Gloria Wang
93aa58fd94 Merge "Fix a memory leak in the Forward Lock plugin. For bug 4770217." 2011-06-21 13:19:36 -07:00
Gloria Wang
7bafb97d3f Fix a memory leak in the Forward Lock plugin. 
For bug 4770217.

Change-Id: I14f4d4ead524c661e68a20738e7a50e4d8fd92ea
 2011-06-21 11:07:59 -07:00
Gloria Wang
464c120266 Merge "-Fix some typo -Remove one unnecessary memory allocation" 2011-06-16 10:23:04 -07:00
Gloria Wang
2980a21375 -Fix some typo 
-Remove one unnecessary memory allocation

Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
 2011-06-15 17:32:06 -07:00
Gloria Wang
8b554f3503 To remove log spam in the Forward Lock DRM plugin. 
Fix for bug 4619159.

Change-Id: Id4984aade4cceb59a1fdf904949f62535decd2a4
 2011-06-14 14:50:10 -07:00
Gloria Wang
cbe0d94adf Duplicated fileDesc is not closed when input file is not forward-lock content. 
Fix for bug 4606053.

Change-Id: I1b45457d8cdc75d268631911f46ce6ec931b1770
 2011-06-13 16:29:38 -07:00
James Dong
3f0341cbbd Fix memory leak from retrieval of getSupportedDrmInfo. 
Change-Id: Ic2192a9791c0a3c5e5357b4367a2d8bfb15af20c
 2011-04-24 12:40:16 -07:00
Gloria Wang
503b111b24 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 
* commit 'ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3':
  Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
 2011-03-25 10:11:49 -07:00
Gloria Wang
4c87a75073 Fix for bug 4126624. 
Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.

Change-Id: I7aacea1bc58ab6425ef6f6f09472c6f2970ebb4d
 2011-03-24 13:14:02 -07:00
Gloria Wang
9e1e9a339e Fix for bug 4165823. 
Add death listener to clean-up drmserver appropriately when drmserver died.
Cherry-pick from master. Do not merge.

Change-Id: I7782cc96ce173a87ebfd315950f3880fa90294d6
 2011-03-24 10:30:57 -07:00
Bill Gruber
f46821b9d9 am 640f63c2: am 3bde4594: am 0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1 
* commit '640f63c2669fc9dc38b349066d4d28111655dc3f':
  DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363
 2011-03-23 16:00:30 -07:00
Bill Gruber
0357ec78b8 Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1 2011-03-23 14:58:31 -07:00
Bill Gruber
0e092f806b DRM API doc scrub 
This change contains information contributed by Sony Corporation.
Bug: 4119363

Change-Id: I6f565c15d512d675993dc65f7fee19bd3d0bc0fa
 2011-03-23 13:21:48 -07:00
Carl Shapiro
5c62d9961d Merge "Include strings.h for the strcasecmp prototype." 2011-03-22 16:18:38 -07:00
Carl Shapiro
39ad826d2e Include strings.h for the strcasecmp prototype. 
Change-Id: I83cd464d59d16f1c5f8afa7e50d474ca2bb41713
 2011-03-22 11:51:57 -07:00
Gloria Wang
66044c1792 am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1 
* commit 'fc4c13be8ce8c2d05432d855c2c61548abef3385':
  Add one more field in DecryptHandle to support bug 4126624
 2011-03-22 11:43:09 -07:00
Gloria Wang
c430394ed7 Add one more field in DecryptHandle to support bug 4126624 
Change-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b
 2011-03-21 19:08:18 -07:00
Gloria Wang
ee4084bf06 do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624. 
Change-Id: If724de60bd6da1becdffc815d5358ffe78629469
 2011-03-21 16:53:14 -07:00