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

47499 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gloria Wang
b8b85ea296 Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1 2011-03-25 10:01:37 -07:00
James Dong
3be1593628 Switch to use SF cached source 
bug - 3500025

Change-Id: I96c416d39af498f091d2d52f5923f556382a9c1f
 2011-03-25 08:41:57 -07:00
Scott Main
f54972d060 am cc4b6a61: am 4045e6b9: docs: a11y doc typo 
* commit 'cc4b6a61c6df67c211ac85d49f457fd562abf142':
  docs: a11y doc typo
 2011-03-24 14:11:39 -07:00
Scott Main
cc4b6a61c6 am 4045e6b9: docs: a11y doc typo 
* commit '4045e6b9ab296436cb5344f3af7184c2ce2a8ff0':
  docs: a11y doc typo
 2011-03-24 14:00:47 -07:00
Scott Main
4045e6b9ab docs: a11y doc typo 
Change-Id: Ib4c41c129c8ecbd738dfe6866bd429efdf17c23f
 2011-03-24 13:25:48 -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
Scott Main
c55a6eed25 am 119e79cf: am e0b3f2a7: docs: fix a few things in a11y doc 
* commit '119e79cf2763592389b4543612400d746bb9aeb2':
  docs: fix a few things in a11y doc
 2011-03-24 12:29:24 -07:00
Scott Main
119e79cf27 am e0b3f2a7: docs: fix a few things in a11y doc 
* commit 'e0b3f2a788e63a10b0fa21bdd700fbcf7e1add34':
  docs: fix a few things in a11y doc
 2011-03-24 12:26:58 -07:00
Scott Main
e0b3f2a788 docs: fix a few things in a11y doc 
Change-Id: I142b0b4498cf6d19655ad1ccc2066e59c39e75a6
 2011-03-24 12:15:35 -07:00
Scott Main
e8eb0f7321 am 95cb883c: am b7cfa729: Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb 
* commit '95cb883c066b754a96c899b48bd487e2ad0f213d':
  docs: add document for accessibility, authored by Cheryl Simon (clsimon)
 2011-03-24 10:54:08 -07:00
Scott Main
95cb883c06 am b7cfa729: Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb 
* commit 'b7cfa72932fbb3c794c6e5509b4a5b716236f558':
  docs: add document for accessibility, authored by Cheryl Simon (clsimon)
 2011-03-24 10:51:50 -07:00
Scott Main
b7cfa72932 Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb 2011-03-24 10:49:59 -07:00
Gloria Wang
480edfb9e0 am e2cd3353: Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1 
* commit 'e2cd33531182b31e0ace2c3acb0e960fbf1ba273':
  Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge.
 2011-03-24 10:42:14 -07:00
Gloria Wang
e2cd335311 Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1 2011-03-24 10:40:26 -07:00
Bill Gruber
d631dd03ec am 6efa3599: am e002734d: Merge "IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948" into honeycomb 
* commit '6efa3599590d3c75a648c3d93353011eb8e30278':
  IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948
 2011-03-24 10:33:53 -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
6efa359959 am e002734d: Merge "IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948" into honeycomb 
* commit 'e002734dd2b330ff6f964eeccaf3c6c6207dd9bf':
  IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948
 2011-03-24 10:30:30 -07:00
Bill Gruber
e002734dd2 Merge "IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948" into honeycomb 2011-03-24 10:26:20 -07:00
Bill Gruber
dd8ea580d4 IAB doc updates for final launch plus bug fixes 
Bug: 3491550
Bug: 3491426
Bug: 3407948

Change-Id: I6f02397a62a3f73599ac7ded28e47d9bb1a3d3e9
 2011-03-24 10:23:52 -07:00
Scott Main
ef467c8d95 docs: add document for accessibility, authored by Cheryl Simon (clsimon) 
Change-Id: If4f6e4f12953ae5b608efebde1ac9d3f0720035a
 2011-03-24 10:16:31 -07:00
Romain Guy
ee06192149 am b5fa4909: DO NOT MERGE Take fake bold font property into account. Bug #4159731 
* commit 'b5fa490995dff116b8a6fdc274bee6f6db4d0d0c':
  DO NOT MERGE Take fake bold font property into account. Bug #4159731
 2011-03-23 19:31:38 -07:00
Romain Guy
b5fa490995 DO NOT MERGE Take fake bold font property into account. 
Bug #4159731

For real this time!

Change-Id: I042eca64bfb355f8d60cec430eb942c900062761
 2011-03-23 17:59:44 -07:00
Teng-Hui Zhu
a7605d3b2e am 2d09b855: Merge "When the video is not on the front, it should be paused" into honeycomb-mr1 
* commit '2d09b855d5c0749ab845d3f2775125fea294f07c':
  When the video is not on the front, it should be paused
 2011-03-23 17:34:15 -07:00
Teng-Hui Zhu
2d09b855d5 Merge "When the video is not on the front, it should be paused" into honeycomb-mr1 2011-03-23 17:32:43 -07:00
Glenn Kasten
503f4daf01 am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1 
* commit '0b1b2a3212cc6c96959e009a9705f94f2ed8b4f4':
  Bug 4159373 Use HDCP debug settings
 2011-03-23 17:06:12 -07:00
Glenn Kasten
0b1b2a3212 Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1 2011-03-23 17:03:46 -07:00
Teng-Hui Zhu
1e26d82ffa When the video is not on the front, it should be paused 
bug:4165855
Change-Id: Icbdab81fe5beb8642841b16773b0e5350b4221cf
 2011-03-23 16:56:12 -07:00
Glenn Kasten
1b11b64bb6 Bug 4159373 Use HDCP debug settings 
Change-Id: Iefc0a0d4b574ee94fbc83bf74b57c1d3465c821c
 2011-03-23 16:08:18 -07:00
Teng-Hui Zhu
503735099d am efb8eda4: Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1 
* commit 'efb8eda41a2dce03db0984c490c16f6a32867ded':
  Make sure the full screen playing continue when timeout
 2011-03-23 16:06:10 -07:00
Wink Saville
464b2259c9 Merge "Fix NPE in CatService.encodeOptionalTags." into honeycomb-LTE 2011-03-23 16:05:52 -07:00
Teng-Hui Zhu
efb8eda41a Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1 2011-03-23 16:03:04 -07:00
shailendra
a450ef0668 am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1 
* commit 'ac390b8cacc45c866ae2e60c0e492a914cf6ec78':
  Fix for Media Server memory leak
 2011-03-23 15:47:47 -07:00
Wink Saville
6b68779ab3 Fix NPE in CatService.encodeOptionalTags. 
If cmdDet.typeOfCommand is bad fromInt returns null we now log the
error instead of causing a Null Pointer Exception.

Change-Id: Id6a0d295d988c2bdbd46a0c0dd6b20f5baf02b27
 2011-03-23 15:47:25 -07:00
Bill Gruber
3bde4594d5 am 0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1 
* commit '0357ec78b82ae104e56c26941d42fa7ef875462b':
  DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363
 2011-03-23 15:43:09 -07:00
shailendra
ac390b8cac Merge "Fix for Media Server memory leak" into honeycomb-mr1 2011-03-23 15:33:51 -07:00
Teng-Hui Zhu
2deec6651c Make sure the full screen playing continue when timeout 
bug:4165804
Change-Id: I5e0f4bdaecce36d074941ae6631b211227c13fcb
 2011-03-23 15:29:22 -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
Scott Main
ee7cfaf289 am 18cd686f: am ef6b305b: docs: fix markup error 
* commit '18cd686fc828c9c75596de1494ecaa5467fcc195':
  docs: fix markup error
 2011-03-23 14:43:35 -07:00
Scott Main
18cd686fc8 am ef6b305b: docs: fix markup error 
* commit 'ef6b305b93009b60ad7c6ddbd200d1b5c554963f':
  docs: fix markup error
 2011-03-23 14:32:44 -07:00
Scott Main
ef6b305b93 docs: fix markup error 
Change-Id: I59e379a7a36c4184862095442c53a6b9496d856e
 2011-03-23 14:23:02 -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
Scott Main
01b649aa3a am 7d02efa1: am fb340563: docs: add Asus driver link to oem driver page 
* commit '7d02efa1029435dfa3a4a9f8449ee1cbda543730':
  docs: add Asus driver link to oem driver page
 2011-03-23 10:33:49 -07:00
Scott Main
7d02efa102 am fb340563: docs: add Asus driver link to oem driver page 
* commit 'fb340563e81f93bc179e51bffc846ac03ff02609':
  docs: add Asus driver link to oem driver page
 2011-03-23 10:25:00 -07:00
Scott Main
fb340563e8 docs: add Asus driver link to oem driver page 
Change-Id: Ia93dd9a6c2c23f236b75a9c83acb8ce4c4b94ffa
 2011-03-23 10:15:36 -07:00
Robert Greenwalt
0b6d044567 am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1 
* commit 'ac70fb8be6ea3a6b49d0a8a26e99c25f92013516':
  Fix adding of default route.
 2011-03-22 21:37:48 -07:00
Robert Greenwalt
ac70fb8be6 Merge "Fix adding of default route." into honeycomb-mr1 2011-03-22 21:36:04 -07:00
shailendra
2d06aee095 Fix for Media Server memory leak 
bug - 4081123

Change-Id: Ic88c13f8006227cff2c91a31f5d1828d007125af
 2011-03-22 21:30:35 -07:00
Eric Rowe
22e21da663 am 5e66ccf5: Merge "Clean up BT stress tests." into honeycomb-mr1 
* commit '5e66ccf5c41bd67e2b1b3f4cc4671af8e115fe7a':
  Clean up BT stress tests.
 2011-03-22 18:59:00 -07:00
Eric Rowe
5e66ccf5c4 Merge "Clean up BT stress tests." into honeycomb-mr1 2011-03-22 18:57:27 -07:00
Robert Greenwalt
edcb4f9d56 Fix adding of default route. 
If you deleted the host routes (started a secondary network like mms, supl
of hipri and then ended it) you would lose the host route to the default
gateway.  Then if you needed to re-add the default gateway route (lost
the connection and removed the default route and then re-established)
you couldn't - can't add a gateway that isn't routable apparently.

This happens if you are in a video chat and lose your connection without
losing the interface (PPP keeps it up for a bit).

Fixed it by having addDefaultRoute first add a hsot route for the gateway
before adding the default route.  This allows the default add to succeed.

bug:3490353
Change-Id: I415e7319832e6456f8757b14c4f79f098a08839b
 2011-03-22 18:47:42 -07:00