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

47558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Johns
e1cc88ccaf am eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService. 
* commit 'eb344a69fa728c010425fb1e18fc8f5774693986':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-03-30 15:26:38 -07:00
Andreas Huber
06ac039962 am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 
* commit 'b676b73e391b10a4ec5fbd6a1a02054fb3d8aa4b':
  When http streaming and Content-Length is unknown, make sure to return all
 2011-03-30 15:19:46 -07:00
Andreas Huber
b676b73e39 Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 2011-03-30 15:16:36 -07:00
Andreas Huber
45ad57aab3 When http streaming and Content-Length is unknown, make sure to return all 
data that we successfully received before signalling the error.

Change-Id: I7e60602d41b4df85aa85e413c590687305e9bbce
related-to-bug: 4190765
 2011-03-30 15:00:34 -07:00
Eric Fischer
acf48255aa am 91c482b2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '91c482b2351db1221308fe90800b8ef8bddbed90':
  Import revised translations.  DO NOT MERGE
 2011-03-30 14:42:30 -07:00
Eric Fischer
91c482b235 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-30 14:39:25 -07:00
Eric Fischer
446b247834 Import revised translations. DO NOT MERGE 
Change-Id: Ic87b36ba6dcc6cea8ef713b47c334156a7dd0f65
 2011-03-30 14:25:28 -07:00
Justin Ho
c7de6dd483 Replacing browser playback controls for inactive videos 
Bug: 4136024

Change-Id: I1c48023005d711d5080fa17a695f709705e362b6
 2011-03-30 14:21:28 -07:00
Trevor Johns
eb344a69fa Fixing line in Market IAB docs that explains how to bind to the 
MarketService.

We use the IMarketBillingService, which is incorrect. It should be
"com.android.vending.billing.MarketBillingService.BIND".
 2011-03-30 14:19:40 -07:00
Ramesh Sudini
e80d327676 Telephony: Cleanup of SIM handling in CdmaLteSST. 
Change-Id: I41ae595bae035b2dfd2e32e4d54a754c27962567
 2011-03-30 12:15:38 -07:00
Ramesh Sudini
afaf4c8fa9 Telephony: Update LTE RILConstants to match ril.h 
Change-Id: I3abc88a98f3ce152df1d8de27da1132c05ee136f
 2011-03-30 12:14:48 -07:00
Scott Main
5c35c05909 am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1 
* commit '5b68c655a1f56dce1ffd6f175e991dd542d415cf':
  docs: update makefile to show javadocs diffs for api level 12
 2011-03-30 12:12:15 -07:00
Scott Main
5b68c655a1 Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1 2011-03-30 12:10:13 -07:00
Andreas Huber
8de5df4392 am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 
* commit 'ebf6a72b3536646ade389c7afa828e316eb93c21':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
 2011-03-30 09:27:14 -07:00
Andreas Huber
ebf6a72b35 Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 2011-03-30 09:12:04 -07:00
Mike Lockwood
cd90d1f117 am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1 
* commit '44e4b99f823a6d6131f94e67389b705d3b124c0a':
  UsbService: Make USB disconnect handling for accessory mode more robust
 2011-03-29 22:16:17 -07:00
Mike Lockwood
44e4b99f82 Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1 2011-03-29 22:14:27 -07:00
Mike Lockwood
4f0f3561ed UsbService: Make USB disconnect handling for accessory mode more robust 
Handle the case where the kernel driver is in accessory mode but we failed
to initialize it at the framework level.  On disconnnect, check to see if the
accessory kernel driver is enabled rather than checking mCurrentAccessory.
That way we will restore the USB state in the kernel even if mCurrentAccessory
is null.

Change-Id: I35d458f21a8b21611946da523d0f53723cab0540
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-29 16:59:38 -07:00
Scott Main
d3b62c961b docs: update makefile to show javadocs diffs for api level 12 
Change-Id: I1ac584db778ec14b18129785126159f692459158
 2011-03-29 16:25:16 -07:00
Wink Saville
fc151b6eb4 Merge "Cleanup DataConnectionTracker" into honeycomb-LTE 2011-03-29 14:44:56 -07:00
Eric Fischer
b8c7c66de2 am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '0664a4b18c3dcea82891a7389976a9d62ac7bc61':
  Import revised translations.  DO NOT MERGE
 2011-03-29 14:15:22 -07:00
Eric Fischer
0664a4b18c am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'b42e83b1eccfd1fa1e02cd0c30edfc06e05de995':
  Import revised translations.  DO NOT MERGE
 2011-03-29 14:07:14 -07:00
Amith Yamasani
c119209662 am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1 
* commit '7171f5b7d16e9a0c861cc249188864385877077f':
  Fix the javadoc for LocationManager.requestSingleUpdate()
 2011-03-29 14:06:29 -07:00
Amith Yamasani
7171f5b7d1 Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1 2011-03-29 13:55:19 -07:00
Eric Fischer
b42e83b1ec Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-03-29 13:45:03 -07:00
Eric Fischer
df491490a6 Import revised translations. DO NOT MERGE 
Change-Id: I09aefa0ca2ba1ff78574c8fbad2242d7ef63689d
 2011-03-29 13:26:46 -07:00
Eric Fischer
bc2489e4c5 am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'f5cedbe508c46c27a6ce1554aed919bfbfc6fc4e':
  Import revised translations.  DO NOT MERGE
 2011-03-29 12:20:42 -07:00
Eric Fischer
f5cedbe508 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-29 12:16:53 -07:00
Eric Fischer
627e59ad08 Import revised translations. DO NOT MERGE 
Change-Id: I962bb9917aa3f3d4b911c1ad7fdfbcda94afa0c7
 2011-03-29 11:58:23 -07:00
Amith Yamasani
e590ccfb12 Fix the javadoc for LocationManager.requestSingleUpdate() 
It was saying the same thing as requestLocationUpdates(), but it only provides a single update.

Change-Id: I0a0f612104a946b7db96928505bb95673377a335
 2011-03-29 11:26:08 -07:00
Andreas Huber
b13c4a9b6c Surfaceflinger expects rectangles to be specified right/bottom edge exclusive. 
Change-Id: Ib493572c614dbb74fa23b13c3e43899e3b31cf0e
related-to-bug: 4147205
 2011-03-29 10:00:20 -07:00
Bill Gruber
0b0dbea0bc am e4f33617: am faede250: IAB doc update for final launch 
* commit 'e4f33617c3654bdcb246ee8f74e67d1828cd42c9':
  IAB doc update for final launch
 2011-03-29 00:00:37 -07:00
Bill Gruber
e4f33617c3 am faede250: IAB doc update for final launch 
* commit 'faede250301e291a060d094c73a25a351f96cbb5':
  IAB doc update for final launch
 2011-03-28 23:48:34 -07:00
Bill Gruber
faede25030 IAB doc update for final launch 
Change-Id: I5173422eb65f4effc61162c2b172750dee0a6a2c
 2011-03-28 19:50:20 -07:00
Wink Saville
59d1b26a6a Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE 2011-03-28 12:11:42 -07:00
Mike Lockwood
b115807aaf am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1 
* commit '7661dd8de10d2400cedc421358c4261556b2b5c8':
  UsbService: Fix JNI local reference leaks in the USB host support code
 2011-03-28 11:00:33 -07:00
Ramesh Sudini
3bbe33d703 DataConnectionTracker cleanup when disposed. 
Change-Id: I4db442ae110531f33280ceb626fc260d392a1bd5
 2011-03-28 11:00:26 -07:00
Mike Lockwood
7661dd8de1 Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1 2011-03-28 10:58:03 -07:00
Andreas Huber
e7cedad2b8 am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1 
* commit '2edbdcc6f2572e5f84253617b1850908344b3f8c':
  After a seek there's a brief period where audio time isn't reestablished.
 2011-03-28 08:16:52 -07:00
Andreas Huber
2edbdcc6f2 Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1 2011-03-28 08:11:26 -07:00
Mike Lockwood
8f8c6023f2 UsbService: Fix JNI local reference leaks in the USB host support code 
Bug: 4175857

Change-Id: I8b385f2257e509b0fb4d5f9516e9813b8165352d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-27 19:35:43 -07:00
Wink Saville
09e4eea135 Cleanup DataConnectionTracker 
Promote apn members from GsmDCT to DCT.
Change getState to have a apnType parameter
Move abstract methods to they are together.


Change-Id: I19bc5d07859c9398076ae32647d8c211d19817d1
 2011-03-26 22:23:57 -07:00
Wink Saville
9eac2c077a Merge "Work around for operator not being correct." into honeycomb-LTE 2011-03-26 16:50:17 -07:00
Wink Saville
3420f85cc6 Merge "Add some debug to apn list creation routines." into honeycomb-LTE 2011-03-26 16:48:35 -07:00
Wink Saville
2a3aa2a32e Work around for operator not being correct. 
This is a STOPSHIP work-around until we figure out why
getSIMOperatorNumeric is not returning valid values.
It has returned NULL, "00000", "310004", "311480" and
once a value "83????", I don't remember the exact value.

Change-Id: I4f1d16c853047b72dd987572d3d67dcc2cd697a2
 2011-03-26 09:13:20 -07:00
Ramesh Sudini
fbe284b675 Telephony: Fix eHRPD Service State Mapping. 
Change-Id: I415c11dc0e1817f7772160c1103105d6007ffdff
 2011-03-26 08:40:32 -07:00
Wink Saville
c6c7ebd92c Add some debug to apn list creation routines. 
Change-Id: Ic5055daefd50b6371f129d82313c533a04cd75b1
 2011-03-26 08:04:30 -07:00
Dirk Dougherty
79da5c2da0 am 0b9bacc6: am 085baa2c: Doc change: Fix scale on highlights screen shots. 
* commit '0b9bacc69314fc6480d1ebe67b7ee0d0aebca5c0':
  Doc change: Fix scale on highlights screen shots.
 2011-03-25 19:25:45 -07:00
Dirk Dougherty
0b9bacc693 am 085baa2c: Doc change: Fix scale on highlights screen shots. 
* commit '085baa2cc3f2d23523377b1df390cec5d3bf1445':
  Doc change: Fix scale on highlights screen shots.
 2011-03-25 19:22:55 -07:00
Dirk Dougherty
085baa2cc3 Doc change: Fix scale on highlights screen shots. 
Change-Id: Id2608498baac70dc69d7b716bbb00f0799af03ca
 2011-03-25 19:07:30 -07:00