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

47333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Wink Saville
a97f49c02b Merge "Tweak RIL.java debug." into honeycomb-LTE 2011-03-22 16:05:22 -07:00
Wink Saville
5d612f1601 Merge "Remove unused onResetDone." into honeycomb-LTE 2011-03-22 15:30:41 -07:00
Robert Greenwalt
8b84377f7d Remove unused onResetDone. 
Refactor things a bit.  Promoting GsmDataConnection's apn (ApnSetting) to DataConnection.
Use DataConnection's resetSynchronously rather than tampering with it from another thread.

bug:3486066

Change-Id: I2a7f7368f73c7d5c81e821976efafd56aca7aa69
 2011-03-22 15:13:34 -07:00
Eric Fischer
b05f0b84b2 am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '3a2575f7e6b1f6da97bd8233dfd3baa8883c5610':
  Import revised translations.  DO NOT MERGE
 2011-03-22 13:59:20 -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
2c6f2816d7 am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1 
* commit '5039e6da1e74c0a0c10772f585ea4e5e6bcf0a16':
  fix for pause when loading
 2011-03-22 13:56:35 -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
b382a05439 am 8dcd6647: Merge "Now have a final API 12." into honeycomb-mr1 
* commit '8dcd66476069c9241c2acbbafc1a85e42bd7a303':
  Now have a final API 12.
 2011-03-22 13:01:19 -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
b819dcd49d am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1 
* commit '8483073ec21b5e2332deaad914eba1d087b1d1e3':
  Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
 2011-03-22 11:50:15 -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
012401774f am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1 
* commit '3cc797b9c416e01ad6bfab5f2bfb2c6cbf9e44ed':
  Add one more field in DecryptHandle to support bug 4126624
 2011-03-22 11:06:43 -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