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

46824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
efb8eda41a Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1 2011-03-23 16:03:04 -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
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
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
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
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
Eric Fischer
3a2575f7e6 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-22 13:56:47 -07:00
Teng-Hui Zhu
5039e6da1e Merge "fix for pause when loading" into honeycomb-mr1 2011-03-22 13:55:28 -07:00
Eric Fischer
765ae04f61 Import revised translations. DO NOT MERGE 
Change-Id: I705ed1f382974b8b12dc024cdb9e2f026e6e86b8
 2011-03-22 13:38:10 -07:00
Dianne Hackborn
8dcd664760 Merge "Now have a final API 12." into honeycomb-mr1 2011-03-22 12:58:00 -07:00
Teng-Hui Zhu
158fbdb29b fix for pause when loading 
bug:4148903

Change-Id: Ib0b59c8c36eb5df8c6755156a5d2753f84ad9677
 2011-03-22 12:02:11 -07:00
shailendra
8483073ec2 Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1 2011-03-22 11:48:12 -07:00
Gloria Wang
3cc797b9c4 Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1 2011-03-22 11:04:32 -07:00
Dianne Hackborn
99ca5cc5c7 Now have a final API 12. 
Change-Id: I7475ed7f82e4875c7e51671703821e5735dc1433
 2011-03-22 10:46:42 -07:00
Andreas Huber
453c0d5f16 Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1 2011-03-22 08:37:58 -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
Teng-Hui Zhu
039aa81a67 Merge "Fix a crash" into honeycomb-mr1 2011-03-21 18:09:57 -07:00
Teng-Hui Zhu
cd44562455 Fix a crash 
bug:4139931
Change-Id: Ifc18f964d5aedb268eb0d5fa08db3ffed1de4ff8
 2011-03-21 17:38:21 -07:00
Yu Shan Emily Lau
0210997218 Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1 2011-03-21 17:32:17 -07:00
Gloria Wang
7abedd0cde Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1 2011-03-21 17:26:03 -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
Justin Ho
9db9a7d3f4 Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 2011-03-21 16:52:35 -07:00
Andreas Huber
8505f2fe1e DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue. 
Change-Id: Ic683201dcfcd11fb4bccfeefc63427a4c9bfabb4
related-to-bug: 4148291
 2011-03-21 16:45:25 -07:00
Justin Ho
c16168091a Fixing list selector theme 
Bug: 4147203

Change-Id: Ib9052ca399a135d42fd5c6ccf2bea8babfe8f0ac
 2011-03-21 15:04:23 -07:00
Andreas Huber
e2c32e9f96 If nothing is to be copied, return right away. 
This avoids a potential out-of-bounds problem in the code below.

Change-Id: I942d55da0a5288b37512cb74407f900a2d824c0c
related-to-bug: 4139974
 2011-03-21 14:16:03 -07:00
Teng-Hui Zhu
0b933c02dd Merge "Support loading image and paused image for inline video" into honeycomb-mr1 2011-03-21 14:01:10 -07:00
Teng-Hui Zhu
265db32f31 Support loading image and paused image for inline video 
bug:4142131

Change-Id: I28d82a8e30a2146a3380c63dcdcbd51228f23f56
 2011-03-21 10:36:00 -07:00
Justin Ho
5e35c4855a Updated 3G and wifi traffic indicators 
Change-Id: I3bc61067d4c30e9cda6170e87552d93c2a084895
 2011-03-21 08:42:54 -07:00
Mike Lockwood
dd76dc0297 Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1 2011-03-20 17:08:24 -07:00
Mike Lockwood
1c0e543638 UsbService: Handle the case where a USB accessory connects as the device is booting 
Bug: 4129297

Change-Id: I8f9d085805fb598572f9b00952c3cd38cfab461b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-19 12:03:46 -04:00
Eric Rowe
2b1fb45fab Clean up BT stress tests. 
Make ConnectPanReceiver a child of ConnectProfileReceiver, check if a
profile proxy is null before trying to connect.  Change log output in
bluetooth.  Remove some oververbose parameters from test runner. Make
the setup for the tests more consistent (delete pairings, etc).

Most of this work has been done to facilitate the tests created for
trade federation.

Change-Id: I7350d308b5d09c2052e0a3f3308a69c564ba4d74
 2011-03-18 20:13:11 -07:00
Jamie Gennis
38caff230d Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1 2011-03-18 17:32:25 -07:00