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

47614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
The Android Open Source Project
ad663d8040 Merge from gingerbread 
Change-Id: I31e3da083b642d5c7cf6332095fa228b840ee7bb
 2011-03-29 13:54:43 -07:00
Eric Fischer
b42e83b1ec Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-03-29 13:45:03 -07:00
Michael I. Gold
c3fba3be74 egl: fixes for object refcounts 
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same.  eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.

Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug: 2964479
 2011-03-29 13:43:54 -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
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
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
Wink Saville
238b5c4e84 am 9eac2c07: Merge "Work around for operator not being correct." into honeycomb-LTE 
* commit '9eac2c077a92a95d0b7a9c766d4c6ee92f625d2e':
  Work around for operator not being correct.
 2011-03-26 16:52:53 -07:00
Wink Saville
9c2c7ace9e am 3420f85c: Merge "Add some debug to apn list creation routines." into honeycomb-LTE 
* commit '3420f85cc65af8e3ec6c651667c8cffbac60ba4e':
  Add some debug to apn list creation routines.
 2011-03-26 16:51:13 -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
Ramesh Sudini
2f4f92a997 am fbe284b6: Telephony: Fix eHRPD Service State Mapping. 
* commit 'fbe284b6756b44819e9f4d13938bad06b238d112':
  Telephony: Fix eHRPD Service State Mapping.
 2011-03-26 09:23:23 -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
538626ec0f am 79da5c2d: am 0b9bacc6: am 085baa2c: Doc change: Fix scale on highlights screen shots. 
* commit '79da5c2da018a2066b7e5d6e8de0c03d00c20492':
  Doc change: Fix scale on highlights screen shots.
 2011-03-25 19:27:18 -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