Commit Graph

12243 Commits

Author SHA1 Message Date
jsh
ef32ea29b3 am 036e2108: Fix NPE when importing from USIM.
Merge commit '036e21083d9936425687d7de29e95b2c458a7e4a' into eclair-plus-aosp

* commit '036e21083d9936425687d7de29e95b2c458a7e4a':
  Fix NPE when importing from USIM.
2010-01-21 17:35:18 -08:00
Fred Quintana
4910d5fb2e Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782" into eclair 2010-01-21 17:30:07 -08:00
Paul Westbrook
938c3d8509 Merge "Bug 2330111" 2010-01-21 17:14:06 -08:00
Paul Westbrook
7d9549172a Bug 2330111
Make NumberPicker public

Made setCurrent() more robust, as the value needs to be within the range
specified earlier. setCurrent() will now throw an exception
if the specified doesn't fall in the range
2010-01-21 16:56:57 -08:00
Wink Saville
34b7c1753e Merge "Fix build, incorrect link/see tags." 2010-01-21 16:46:42 -08:00
Dianne Hackborn
3bdbaaa18f Merge "Don't crash when there is no admin." 2010-01-21 16:44:53 -08:00
Mathias Agopian
35e973f696 Merge changes I2d41cb94,Ia1a17985
* changes:
  fix [2324665] texture leak in surfaceflinger when using camera
  fix a texture leak introduced recently.
2010-01-21 16:37:48 -08:00
Mathias Agopian
edfd97c0f2 fix [2324665] texture leak in surfaceflinger when using camera 2010-01-21 16:29:34 -08:00
Mathias Agopian
8c3b597aa7 fix a texture leak introduced recently.
create the texture name once and for all for a given BufferSource
and make sure to recreate it when we're forced to delete the texture.
2010-01-21 16:27:30 -08:00
Doug Zongker
a2fe2f39d9 Merge "relocate GoogleLoginService" 2010-01-21 16:10:58 -08:00
Yu Shan Emily Lau
94481bfd87 am b1780474: Merge "Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair
Merge commit 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f' into eclair-plus-aosp

* commit 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f':
  Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player.
2010-01-21 15:14:36 -08:00
Eric Fischer
202b2b540b am 50adb167: Pull in "emergency calls only" translations.
Merge commit '50adb167534889421dc0d7cfc7d3bf663c03f01c' into eclair-plus-aosp

* commit '50adb167534889421dc0d7cfc7d3bf663c03f01c':
  Pull in "emergency calls only" translations.
2010-01-21 15:14:30 -08:00
Yu Shan Emily Lau
c125c2cd7c Merge "Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair 2010-01-21 15:07:51 -08:00
Wink Saville
0693d08bd4 Merge "Fix build, GsmServiceStateTracker was using old EventLog API." 2010-01-21 15:00:12 -08:00
Grace Kloba
834081811a am 88196464: (-s ours) am 4d69ac66: Merge "DO NOT MERGE" into eclair
Merge commit '88196464e91dd533f2dd28a02f55b7e4801eead0'

* commit '88196464e91dd533f2dd28a02f55b7e4801eead0':
  DO NOT MERGE
2010-01-21 14:32:01 -08:00
Grace Kloba
01627527e5 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2010-01-21 14:31:45 -08:00
Grace Kloba
5dac46fa33 am c8cab725: (-s ours) am d1019a99: Merge "DO NOT MERGE" into eclair
Merge commit 'c8cab72521781091e87049861c4b25fb19197ea4'

* commit 'c8cab72521781091e87049861c4b25fb19197ea4':
  DO NOT MERGE
2010-01-21 14:31:33 -08:00
Xavier Ducrohet
e34151d8cd am 20cc5570: am 79f05bb4: Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair
Merge commit '20cc55703348827fbd80ff0410777a537f01e10e'

* commit '20cc55703348827fbd80ff0410777a537f01e10e':
  ADT/Layoutlib: improved gradient drawing for perf.
2010-01-21 14:31:11 -08:00
Xavier Ducrohet
4ac4775f3d am 38fa9eee: am 89d538dc: ADT/Layoutlib: don\'t draw 0-sized rectangle, AWT doesn\'t like that.
Merge commit '38fa9eee9324b2355f28372e80dba12c1d7cc105'

* commit '38fa9eee9324b2355f28372e80dba12c1d7cc105':
  ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.
2010-01-21 14:30:48 -08:00
Xavier Ducrohet
1736f2f16a am 895c92a4: am 240298f9: Merge "ADT/Layoutlib: always use custom gradient (java) Paint." into eclair
Merge commit '895c92a44b8bcf0aec7066c061293cafe12a76c2'

* commit '895c92a44b8bcf0aec7066c061293cafe12a76c2':
  ADT/Layoutlib: always use custom gradient (java) Paint.
2010-01-21 14:30:17 -08:00
Roman Nurik
bc5a9796e3 am b8c564d0: am 6a739ea8: Merge "Updated developer groups documentation to point to Stack Overflow, also rearranged a few things." into eclair
Merge commit 'b8c564d0fc7b2bdcc794d63f23b21df2540d7cef'

* commit 'b8c564d0fc7b2bdcc794d63f23b21df2540d7cef':
  Updated developer groups documentation to point to Stack Overflow, also rearranged a few things.
2010-01-21 14:29:26 -08:00
Xavier Ducrohet
db35a3115c am 31ef2e77: am b847fbf2: Merge "ADT/Layout: support for 3+ color in linear gradients" into eclair
Merge commit '31ef2e77c50485ad6ed410a5d341754d6787b8e1'

* commit '31ef2e77c50485ad6ed410a5d341754d6787b8e1':
  ADT/Layout: support for 3+ color in linear gradients
2010-01-21 14:29:02 -08:00
John Wang
b119686b3d am 7f70998d: Merge "Add Emergency Calls Only String." into eclair
Merge commit '7f70998dec6d7db850373b7e75677ecf72904878' into eclair-plus-aosp

* commit '7f70998dec6d7db850373b7e75677ecf72904878':
  Add Emergency Calls Only String.
2010-01-21 14:06:35 -08:00
John Wang
402dce2453 Merge "Add Emergency Calls Only String." into eclair 2010-01-21 13:38:32 -08:00
Leon Scroggins
aa774c3e81 Merge "Create a common method for updating the title of a download from the filename." 2010-01-21 13:29:32 -08:00
John Wang
91d3dd13ed am 7319d94f: am 99f2a4bb: Merge "Add Event log for RAT switch." into eclair
Merge commit '7319d94ff1ca898c36d2da8dd0cd8469d91bc5af'

* commit '7319d94ff1ca898c36d2da8dd0cd8469d91bc5af':
  Add Event log for RAT switch.
2010-01-21 12:47:13 -08:00
Wei Huang
72f98a9314 am 495bae67: Merge "fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair
Merge commit '495bae67ff7df4a11325a4cc1d8af288f82128fe' into eclair-plus-aosp

* commit '495bae67ff7df4a11325a4cc1d8af288f82128fe':
  fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
2010-01-21 12:28:08 -08:00
Wei Huang
34c0d1e324 Merge "fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair 2010-01-21 12:21:11 -08:00
Amith Yamasani
3f0f4602b8 Merge "Workaround for a database update callback that claims that the data doesn't exist." 2010-01-21 11:22:01 -08:00
The Android Open Source Project
7f57368008 merge from open-source master 2010-01-21 11:21:25 -08:00
Ying Wang
631cd7a7ff am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclair
Merge commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be' into eclair-plus-aosp

* commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be':
  Find layout classes in all "layout-*" dirs.
2010-01-21 11:12:29 -08:00
Ying Wang
936155884a Merge "Find layout classes in all "layout-*" dirs." into eclair 2010-01-21 11:07:14 -08:00
Andreas Huber
c79a720825 Merge "Fix circular dependency between StagefrightPlayer and AwesomePlayer that prevented proper cleanup." 2010-01-21 10:44:54 -08:00
Andreas Huber
27ed8d59bf Merge "Special-case .wmv and .wma metadata retrieval and playback to use PV if available." 2010-01-21 10:44:47 -08:00
Vasu Nori
dc11327790 Merge "caching PRAGMA sql statements caused cts-tests failures." 2010-01-21 10:29:22 -08:00
Robert Greenwalt
c257d866cb am 9fdf82e0: Merge "Try to switch to another default net on connection failure." into eclair
Merge commit '9fdf82e080ea20086378e751ace245a4a1b022dc' into eclair-plus-aosp

* commit '9fdf82e080ea20086378e751ace245a4a1b022dc':
  Try to switch to another default net on connection failure.
2010-01-21 10:05:13 -08:00
Robert Greenwalt
315503b59b Merge "Try to switch to another default net on connection failure." into eclair 2010-01-21 09:57:46 -08:00
Derek Sollenberger
0cb6ce5f88 am 1f7747ad: am 7cabb03d: Resize the WebView when the soft-keyboard appears in landscape mode.
Merge commit '1f7747adb6a79317f4bd52fb78b3c567dd203883'

* commit '1f7747adb6a79317f4bd52fb78b3c567dd203883':
  Resize the WebView when the soft-keyboard appears in landscape mode.
2010-01-21 08:39:15 -08:00
Derek Sollenberger
224b2a71c0 am 7cabb03d: Resize the WebView when the soft-keyboard appears in landscape mode.
Merge commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1' into eclair-mr2-plus-aosp

* commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1':
  Resize the WebView when the soft-keyboard appears in landscape mode.
2010-01-21 08:29:33 -08:00
Mike Lockwood
1d42c81cc5 Merge "Implement Notification.DEFAULT_LIGHTS flag." 2010-01-21 08:18:15 -08:00
Irfan Sheriff
da734680cc am dcc14d6a: Merge "Use MCC value to always override channel count setting" into eclair
Merge commit 'dcc14d6a26961a3ba45eaeb7305fdafb2b6694e2' into eclair-plus-aosp

* commit 'dcc14d6a26961a3ba45eaeb7305fdafb2b6694e2':
  Use MCC value to always override channel count setting
2010-01-21 07:52:52 -08:00
Irfan Sheriff
fd94379c35 Merge "Use MCC value to always override channel count setting" into eclair 2010-01-21 07:46:49 -08:00
Grace Kloba
9be6891f33 am f6aed0e0: Merge "DO NOT MERGE" into eclair
Merge commit 'f6aed0e0a7c96094b66f5426baad78032b794497' into eclair-plus-aosp

* commit 'f6aed0e0a7c96094b66f5426baad78032b794497':
  DO NOT MERGE
2010-01-20 23:34:42 -08:00
Grace Kloba
965f42fdf1 Merge "DO NOT MERGE" into eclair 2010-01-20 23:30:05 -08:00
Grace Kloba
82fe43131c am d5ada83c: ScaleGestureDetector needs to query the displaymetrics for the width/height on each touch down as orientation can change.
Merge commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b' into eclair-plus-aosp

* commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b':
  ScaleGestureDetector needs to query the displaymetrics
2010-01-20 23:26:03 -08:00
Nick Pelly
7c360aaf6c am e834722f: Merge "Fix failure to open AVRCP input device due to EPERM." into eclair
Merge commit 'e834722f547d13eaa453464502456892c6225e42' into eclair-plus-aosp

* commit 'e834722f547d13eaa453464502456892c6225e42':
  Fix failure to open AVRCP input device due to EPERM.
2010-01-20 20:46:35 -08:00
Nick Pelly
1a01fad3c3 Merge "Fix failure to open AVRCP input device due to EPERM." into eclair 2010-01-20 20:43:54 -08:00
Nick Pelly
c81bb207c6 Fix failure to open AVRCP input device due to EPERM.
Sleep for 100us and try to open the input device again if it fails, with a
maximum of 10 attempts.

We need the retry logic because setting permissions on a new input device is
racy. The init process watches for new input device (via uevent) and sets the
permission on them in devices.c:make_device(). However at the same time
EventHub.cpp watches for new input devices from the system_server process, and
immediately tries to open them. I can't see a simple way to avoid this race
condition.

As best as I can tell this race condition has always exisited.
There must have been some timing change that happened recently that causes us
to hit this race condition much more often. See repro notes in referenced bug.

Bug: 2375632
2010-01-20 19:56:24 -08:00
Grace Kloba
c944873565 am 8681df90: DO NOT MERGE
Merge commit '8681df902e8cc61d290808c5d78ea48920d30f3b' into eclair-plus-aosp

* commit '8681df902e8cc61d290808c5d78ea48920d30f3b':
  DO NOT MERGE
2010-01-20 19:20:57 -08:00
Mike Reed
1ac35fbecd am a66baccc: Merge "Do not merge" into eclair
Merge commit 'a66baccc8fa9f6fa5f1630845e3c6370cb3418eb' into eclair-plus-aosp

* commit 'a66baccc8fa9f6fa5f1630845e3c6370cb3418eb':
  Do not merge
2010-01-20 18:35:24 -08:00