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

121036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Tinker
6dc8063d2a am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev 
* commit '433a063309ba9ff9cdce4f9688e027c642a79505':
  Support CAST V2 Authentication in MediaDrm
 2014-04-01 22:00:49 +00:00
Craig Mautner
ffb22827d7 am 2b6fe299: am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev 
* commit '2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 21:56:55 +00:00
Jeff Tinker
433a063309 Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev 2014-04-01 21:54:29 +00:00
Craig Mautner
2b6fe2990d am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev 
* commit 'c70f15fe298655de02c2e72023fafe6fc33d2a55':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 21:48:04 +00:00
Craig Mautner
c70f15fe29 am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev 
* commit '2fc798a2270cda98366776af489d45c1043e831d':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 21:41:15 +00:00
Jeff Tinker
e4095a80b6 Support CAST V2 Authentication in MediaDrm 
Java API version

Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.

Change-Id: I23cfbbbc89c1226b7a3968ce8bc1e2d4bd41014a
related-to-bug: 12702350
 2014-04-01 14:25:35 -07:00
Craig Mautner
2fc798a227 resolved conflicts for merge of 8c6e6e73 to klp-dev 
Change-Id: I9fc9bc3d935e9e730ebca767d848b1c66203f3b4
 2014-04-01 13:57:37 -07:00
Michael Kolb
2c73e08d36 am 17bbd976: Merge "Add outset to decor view measuring" into klp-modular-dev 
* commit '17bbd976c0971f25447b2ce66117f08029dc2fa9':
  Add outset to decor view measuring
 2014-04-01 20:46:38 +00:00
Michael Kolb
17bbd976c0 Merge "Add outset to decor view measuring" into klp-modular-dev 2014-04-01 20:40:35 +00:00
Craig Mautner
8c6e6e7372 am 13b75939: am d4d2aa51: am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit '13b75939596eec63c096fe9e85643b8c42a40b12':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 20:01:32 +00:00
Craig Mautner
13b7593959 am d4d2aa51: am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit 'd4d2aa519fb1a9d54c14da858a4ab7ab0880f34d':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:54:59 +00:00
Craig Mautner
d4d2aa519f am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit 'efbe7cc0ff5c85cc7956bb3099402c7ebbe20591':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:49:36 +00:00
Craig Mautner
efbe7cc0ff am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit 'd1c82f8fc22216e9b544e3a3b521bcad05bc113d':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:43:41 +00:00
Craig Mautner
d1c82f8fc2 am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit '1cb3c1d381c389c7ef903c1a871ff695cd406da4':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:36:48 +00:00
Craig Mautner
1cb3c1d381 am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit 'fc80fbe3d5b287c19e3dab89fc93ca4b8a812bb1':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:30:41 +00:00
quddusc
913c903612 am f425e5ea: am c7f403f4: am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs 
* commit 'f425e5ea05bf445ab97176fe4a79e54f976d22b8':
  docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
 2014-04-01 19:29:52 +00:00
Scott Main
f80749c5c5 am c3796073: am c8b6feb2: am 35682006: Merge "laptop image with redacted" into klp-docs 
* commit 'c37960733aebed4ef4d64d72f7658534f9fd5698':
  laptop image with redacted
 2014-04-01 19:29:45 +00:00
Scott Main
402f23046c am 3bd0a44b: am a7afd38f: am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs 
* commit '3bd0a44bbf8de4dc1d190fffe91a10b8f1e2243f':
  dashbaord update for 4/1/14
 2014-04-01 19:29:41 +00:00
Ricardo Cervera
3b7432d2e4 am bb755da9: am c192cdd3: am cf96f815: docs: Renamed the document on building with Android Studio 
* commit 'bb755da9f7a2a4d3ea103afbc2140901d28e8f74':
  docs: Renamed the document on building with Android Studio
 2014-04-01 19:29:38 +00:00
Craig Mautner
fc80fbe3d5 am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit '7bd0b65233d0ef34114ecb93d734dfe4351f470d':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:24:23 +00:00
Craig Mautner
7bd0b65233 am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit '4bdab6bb4c55661d4915518b1190e30c4633c6a5':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:18:36 +00:00
Craig Mautner
4bdab6bb4c Fix FLAG_DISMISS_KEYGUARD not working 
Fixes bug 13672528.

Change-Id: I0292aee51d5d8755bbae926e5f0e6af1e22107dc
 2014-04-01 12:10:54 -07:00
quddusc
f425e5ea05 am c7f403f4: am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs 
* commit 'c7f403f46d824c17f9bd1fb6447425eacc2cccfe':
  docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
 2014-04-01 18:30:33 +00:00
quddusc
c7f403f46d am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs 
* commit '5321e9bd48db680c618a490fb38c060c3c05beba':
  docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
 2014-04-01 18:24:38 +00:00
quddusc
5321e9bd48 Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs 2014-04-01 18:12:06 +00:00
Scott Main
c37960733a am c8b6feb2: am 35682006: Merge "laptop image with redacted" into klp-docs 
* commit 'c8b6feb2007259cdc4053a9774e31847ee60d592':
  laptop image with redacted
 2014-04-01 17:59:12 +00:00
Scott Main
3bd0a44bbf am a7afd38f: am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs 
* commit 'a7afd38f3021a15e0bd22674409c2cd6d83095c3':
  dashbaord update for 4/1/14
 2014-04-01 17:59:08 +00:00
quddusc
f74a6cf388 docs: Fixed outdated link to Google Analytics docs. 
Bug: 13742301

Change-Id: Idb439a38299be808cd1cd1d317d67efe78f785cc
 2014-04-01 17:53:55 +00:00
Scott Main
c8b6feb200 am 35682006: Merge "laptop image with redacted" into klp-docs 
* commit '356820063afa85c78dd7f7b9bce2b62169e490bc':
  laptop image with redacted
 2014-04-01 17:52:36 +00:00
Scott Main
a7afd38f30 am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs 
* commit '1afdbb93446cdc9238bf327155646950ae80dbe4':
  dashbaord update for 4/1/14
 2014-04-01 17:52:33 +00:00
Ricardo Cervera
bb755da9f7 am c192cdd3: am cf96f815: docs: Renamed the document on building with Android Studio 
* commit 'c192cdd3c4ad8696d5d77949984cf7e06445e051':
  docs: Renamed the document on building with Android Studio
 2014-04-01 17:49:40 +00:00
Scott Main
356820063a Merge "laptop image with redacted" into klp-docs 2014-04-01 17:47:03 +00:00
Scott Main
1afdbb9344 Merge "dashbaord update for 4/1/14" into klp-docs 2014-04-01 17:46:37 +00:00
Ricardo Cervera
c192cdd3c4 am cf96f815: docs: Renamed the document on building with Android Studio 
* commit 'cf96f815854b87f8a2304fbaf5030d574671e6e0':
  docs: Renamed the document on building with Android Studio
 2014-04-01 17:43:32 +00:00
Scott Main
b0b84487c1 dashbaord update for 4/1/14 
Change-Id: Id38d8a448dc86afecc2e80dc6a5f4fdb26d7cc93
 2014-04-01 10:39:42 -07:00
Ricardo Cervera
cf96f81585 docs: Renamed the document on building with Android Studio 
Change-Id: Icc2d3562f8d77b593e7a7bac61675a5b15fcd535
 2014-04-01 10:16:45 -07:00
Scott Main
bb55852daf laptop image with redacted 
Change-Id: I89e6b37840757a53c38686a2cf69297e558ef6d0
 2014-03-31 20:40:34 -07:00
Baligh Uddin
a3e6f36f40 am 8c3d3e82: (-s ours) am 53b3d44f: (-s ours) am dc5e02bd: (-s ours) Import translations. DO NOT MERGE 
* commit '8c3d3e826932da75f5399baaf5bcbc3b1f3a9372':
  Import translations. DO NOT MERGE
 2014-04-01 00:21:37 +00:00
Katie McCormick
fb19fc61f2 am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix. 
* commit '905a5b1477b3a1899ef389dbe081f9c70a4fe13d':
  Doc Update: revert PendingIntent fix.
 2014-04-01 00:21:34 +00:00
Baligh Uddin
8c3d3e8269 am 53b3d44f: (-s ours) am dc5e02bd: (-s ours) Import translations. DO NOT MERGE 
* commit '53b3d44f524c162a18ca91034c90ac9f7e62e561':
  Import translations. DO NOT MERGE
 2014-04-01 00:15:57 +00:00
Katie McCormick
905a5b1477 am 87d9d1a0: Doc Update: revert PendingIntent fix. 
* commit '87d9d1a0405e6cdbcd7c87cfebee04b622100753':
  Doc Update: revert PendingIntent fix.
 2014-04-01 00:15:52 +00:00
Jason Sams
c796ccaafb am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem" 
* commit '095ece10095ecb8c76e3ed4fb0dd1e23a5ced22b':
  Fix RenderScriptGL setSurfaceTexture problem
 2014-04-01 00:15:26 +00:00
Scott Main
7471a3b1ea am adcb288e: am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs 
* commit 'adcb288e3890381c9961ee32a79df8e9d805a6ad':
  update common intents guide to add calendar and alarms.
 2014-04-01 00:12:56 +00:00
Baligh Uddin
ce0854ccba am ee800b04: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'ee800b04d9ed625db93b1531eec0595838228e2f':
  Import translations. DO NOT MERGE
 2014-04-01 00:12:47 +00:00
Jason Sams
095ece1009 am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem" 
* commit 'b3cafa56205942343930e4fbb0a3d50d6e33a046':
  Fix RenderScriptGL setSurfaceTexture problem
 2014-04-01 00:10:55 +00:00
Baligh Uddin
53b3d44f52 am dc5e02bd: (-s ours) Import translations. DO NOT MERGE 
* commit 'dc5e02bdccbbc60ede21ae706f06c696b6983812':
  Import translations. DO NOT MERGE
 2014-04-01 00:09:22 +00:00
Scott Main
adcb288e38 am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs 
* commit 'b1088bfe8d321f299d92736102b573963315dc26':
  update common intents guide to add calendar and alarms.
 2014-04-01 00:03:18 +00:00
Michael Kolb
5de886a158 Add outset to decor view measuring 
Change-Id: Ib0e68311ff8ed1fccf9219b28c42ee43c5952050
 2014-03-31 16:49:55 -07:00
Jason Sams
b3cafa5620 Merge "Fix RenderScriptGL setSurfaceTexture problem" 2014-03-31 23:21:42 +00:00
Katie McCormick
87d9d1a040 Doc Update: revert PendingIntent fix. 
Original fix was in error. Reverting. See:

b/10641568

Change-Id: I471157388b2d55aa99bd16813c07607b8a0a7046
 2014-03-31 16:18:15 -07:00