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

47569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Fitzpatrick
5db7fd6b70 am f7a9b869: am 1e7fb7ae: Merge "Error in compound cache-control header." 
* commit 'f7a9b8691918642db74a667a71028c0a77b527ff':
  Error in compound cache-control header.
 2011-03-30 08:21:23 -07:00
Brad Fitzpatrick
0ddcc8bc60 am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 
* commit 'b618b2ef8722964730d09a86a06a85ca34df6de4':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
 2011-03-30 08:20:58 -07:00
Brad Fitzpatrick
f68098534e am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when vibration is removed" 
* commit '7a84a60d569ef7373fbb6418026b935d48fcd7e7':
  Unregister callback from binder when vibration is removed
 2011-03-30 08:20:51 -07:00
Mike Lockwood
08d5de8339 am cd90d1f1: am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1 
* commit 'cd90d1f1173c344738362d24bdc637c355b75645':
  UsbService: Make USB disconnect handling for accessory mode more robust
 2011-03-29 22:17:36 -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
Jeff Hamilton
0c691f0eb3 am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID. 
* commit 'ad91eee2774e18204a14d473242efe5640b91152':
  Update the value for the NFC shared UID.
 2011-03-29 16:28:49 -07:00
Wink Saville
8a39562404 am fc151b6e: Merge "Cleanup DataConnectionTracker" into honeycomb-LTE 
* commit 'fc151b6eb4a682510f3591879037b524bc8d59d0':
  Cleanup DataConnectionTracker
 2011-03-29 15:12:22 -07:00
Wink Saville
fc151b6eb4 Merge "Cleanup DataConnectionTracker" into honeycomb-LTE 2011-03-29 14:44:56 -07:00
Eric Fischer
c9e5464b06 am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'b8c7c66de23b9b20f3992722bb5e346d8e12dd0e':
  Import revised translations.  DO NOT MERGE
 2011-03-29 14:19:51 -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
Amith Yamasani
342f38f9a9 am c1192096: am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1 
* commit 'c1192096627f2f9da534cb8ab7b449d6ea82123f':
  Fix the javadoc for LocationManager.requestSingleUpdate()
 2011-03-29 14:10:32 -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
Bart Sears
7cad54cb82 am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread 
* commit '35137d669681a0d6a22316c035ea7c8edc8fdc33':
  Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
 2011-03-29 13:19:07 -07:00
Huahui Wu
97621525c5 am 772f5bb1: (-s ours) am f440831d: DO NOT MERGE 
* commit '772f5bb1894710b0f0068d4f34e85ce38becc4b6':
  DO NOT MERGE
 2011-03-29 13:19:01 -07:00
Eric Fischer
7d5ae75378 am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'bc2489e4c55ca7ae06afe1f3449135aa48359165':
  Import revised translations.  DO NOT MERGE
 2011-03-29 12:27:29 -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
Brad Fitzpatrick
f7a9b86919 am 1e7fb7ae: Merge "Error in compound cache-control header." 
* commit '1e7fb7aed7b00cebc8f0e501c911727af6527523':
  Error in compound cache-control header.
 2011-03-29 09:27:16 -07:00
Brad Fitzpatrick
1e7fb7aed7 Merge "Error in compound cache-control header." 2011-03-29 08:55:02 -07:00
Brad Fitzpatrick
fae5e2894f am 6f67e7bf: am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars." 
* commit '6f67e7bf831147257e078dd72a22f2e43e009122':
  Making it possible to call SIP calls with special allowed chars.
 2011-03-29 08:45:30 -07:00
Brad Fitzpatrick
8ef609abe5 am a4206029: am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc." 
* commit 'a4206029cbb8f6c02c47db52f84b7d52e154e35a':
  Fixing the wrong link in YuvImage JavaDoc.
 2011-03-29 08:45:20 -07:00
Bill Gruber
67a249d607 am 0b0dbea0: am e4f33617: am faede250: IAB doc update for final launch 
* commit '0b0dbea0bc38087dfa3e82b91c0381154bb8bdfd':
  IAB doc update for final launch
 2011-03-29 00:06:18 -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
Henrik Baard
eb0ced7a09 Error in compound cache-control header. 
A cache control header containing both no-cache and max-age attribute does not
behave as expected.

Cache-Control: no-cache, max-age=200000

Will set expired to 20000ms seconds, ignoring the no-cache header. My
interpretation is that the no-cache header should not be ignored in
this case.

Change-Id: Iadd1900e4d2c6c0dacc6bb3e7b944cf78ca9b266
 2011-03-29 08:54:09 +02: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
94a19db5a7 am 59d1b26a: Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE 
* commit '59d1b26a6a4b9b2de829d62af2179f57deb79391':
  DataConnectionTracker cleanup when disposed.
 2011-03-28 12:13:22 -07:00
Wink Saville
59d1b26a6a Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE 2011-03-28 12:11:42 -07:00
Mike Lockwood
038c7297c9 am b115807a: am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1 
* commit 'b115807aaf0fc6326903302be9bd9ff3877fa968':
  UsbService: Fix JNI local reference leaks in the USB host support code
 2011-03-28 11:02:58 -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
a4a81aef39 am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1 
* commit 'e7cedad2b8408a13c610f3a7fcf13597a432a37d':
  After a seek there's a brief period where audio time isn't reestablished.
 2011-03-28 08:26:21 -07:00
Brad Fitzpatrick
b618b2ef87 am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 
* commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
 2011-03-28 08:26:02 -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
Brad Fitzpatrick
7a84a60d56 am 1a5a2379: Merge "Unregister callback from binder when vibration is removed" 
* commit '1a5a2379eb3a6cf16fb153aecbc4ac9e85d3ed42':
  Unregister callback from binder when vibration is removed
 2011-03-28 08:15:35 -07:00
Brad Fitzpatrick
f0dbf00d37 Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 2011-03-28 08:13:08 -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
Brad Fitzpatrick
1a5a2379eb Merge "Unregister callback from binder when vibration is removed" 2011-03-28 07:59:08 -07:00
Christer Fletcher
375fb9bfd2 Handle OutOfMemoryError when decoding images in ThumbnailUtils 
Added handling of OutOfMemoryError handling to createImageThumbnail
method in ThumbnailUtils.java. During mediascanner run it would run
out of memory when trying to decode very large images. Now it handles
this error and returns null which is handled by the media scanner.

Change-Id: Ie68722dfa1cedd3c0847bf483baa40c4827ad5a8
 2011-03-28 14:47:55 +02: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