OSDN Git Service
Eric Laurent [Mon, 22 Feb 2010 19:13:08 +0000 (11:13 -0800)]
Joe Onorato [Thu, 18 Feb 2010 12:52:46 +0000 (04:52 -0800)]
am
ee3bbefd: Merge "Don\'t crash the system process when apps give us a bad foreground service notification." into eclair
Merge commit '
ee3bbefd34fd5330ebbc59175a328197ab7526af' into eclair-plus-aosp
* commit '
ee3bbefd34fd5330ebbc59175a328197ab7526af':
Don't crash the system process when apps give us a bad foreground service notification.
Joe Onorato [Thu, 18 Feb 2010 12:46:32 +0000 (04:46 -0800)]
Merge "Don't crash the system process when apps give us a bad foreground service notification." into eclair
Romain Guy [Thu, 18 Feb 2010 05:22:52 +0000 (21:22 -0800)]
Romain Guy [Thu, 18 Feb 2010 05:17:48 +0000 (21:17 -0800)]
Romain Guy [Thu, 18 Feb 2010 05:10:34 +0000 (21:10 -0800)]
am
8368ef0b: Manual merge of 40080 DO NOT MERGE Properly notifies listener when an animation is cancelled. Bug: #
2428005.
Merge commit '
8368ef0b670f8193f3161671b119e78b1fb659a1' into eclair-plus-aosp
* commit '
8368ef0b670f8193f3161671b119e78b1fb659a1':
Manual merge of 40080 DO NOT MERGE
android-build SharedAccount [Tue, 16 Feb 2010 20:53:04 +0000 (12:53 -0800)]
Wink Saville [Sat, 13 Feb 2010 17:42:07 +0000 (09:42 -0800)]
am
6b178e47: Merge "Always assume evdoXxxx signal strength values are correct." into eclair
Merge commit '
6b178e472266052b4a9b28b1e4a5cef07f1ebf8b' into eclair-plus-aosp
* commit '
6b178e472266052b4a9b28b1e4a5cef07f1ebf8b':
Always assume evdoXxxx signal strength values are correct.
Wink Saville [Sat, 13 Feb 2010 17:36:17 +0000 (09:36 -0800)]
Merge "Always assume evdoXxxx signal strength values are correct." into eclair
Xavier Ducrohet [Sat, 13 Feb 2010 01:52:28 +0000 (17:52 -0800)]
am
2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair
Merge commit '
2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a' into eclair-plus-aosp
* commit '
2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a':
Add --auto-add-overlay option to aapt. DO NOT MERGE
Xavier Ducrohet [Sat, 13 Feb 2010 01:48:36 +0000 (17:48 -0800)]
Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair
Scott Main [Fri, 12 Feb 2010 23:29:27 +0000 (15:29 -0800)]
am
19bc31c3: Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair
Merge commit '
19bc31c32d75ebebacd85cac2cf4c31108329613' into eclair-plus-aosp
* commit '
19bc31c32d75ebebacd85cac2cf4c31108329613':
docs: remove old tutorial and sample pages from the sitemap
Scott Main [Fri, 12 Feb 2010 23:25:44 +0000 (15:25 -0800)]
Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair
Jason Sams [Fri, 12 Feb 2010 19:27:01 +0000 (11:27 -0800)]
am
0b9bbb6d: DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
Merge commit '
0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8' into eclair-plus-aosp
* commit '
0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8':
DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
The Android Open Source Project [Thu, 11 Feb 2010 18:03:02 +0000 (10:03 -0800)]
merge from open-source master
Eric Laurent [Thu, 11 Feb 2010 17:34:59 +0000 (09:34 -0800)]
am
c1eba82b: Merge "Fix issue:
2413494: Add TTY support." into eclair
Merge commit '
c1eba82ba479006045c1d7a4c8ceba116a9602d1' into eclair-plus-aosp
* commit '
c1eba82ba479006045c1d7a4c8ceba116a9602d1':
Fix issue:
2413494: Add TTY support.
Eric Laurent [Thu, 11 Feb 2010 17:23:21 +0000 (09:23 -0800)]
Merge "Fix issue:
2413494: Add TTY support." into eclair
Dirk Dougherty [Wed, 10 Feb 2010 17:41:15 +0000 (09:41 -0800)]
am
d74bf162: Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair
Merge commit '
d74bf1623913bade8f58369f39ebc666d551bb57' into eclair-plus-aosp
* commit '
d74bf1623913bade8f58369f39ebc666d551bb57':
Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper.
Bart Sears [Wed, 10 Feb 2010 17:41:06 +0000 (09:41 -0800)]
am
a1ab9766: Merge "DO NOT MERGE" into eclair
Merge commit '
a1ab9766718e11cb31bd5e87cda2a2bac03573db' into eclair-plus-aosp
* commit '
a1ab9766718e11cb31bd5e87cda2a2bac03573db':
DO NOT MERGE
Dirk Dougherty [Wed, 10 Feb 2010 17:38:01 +0000 (09:38 -0800)]
Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair
Bart Sears [Wed, 10 Feb 2010 17:35:37 +0000 (09:35 -0800)]
Merge "DO NOT MERGE" into eclair
Bart Sears [Wed, 10 Feb 2010 17:18:37 +0000 (09:18 -0800)]
am
926780b0: Merge "DO NOT MERGE" into eclair
Merge commit '
926780b023a09d37e8dcf1fabf6fa990f042f06d' into eclair-plus-aosp
* commit '
926780b023a09d37e8dcf1fabf6fa990f042f06d':
DO NOT MERGE
Bart Sears [Wed, 10 Feb 2010 17:13:48 +0000 (09:13 -0800)]
Merge "DO NOT MERGE" into eclair
Dirk Dougherty [Wed, 10 Feb 2010 02:44:18 +0000 (18:44 -0800)]
am
859f4556: Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair
Merge commit '
859f455645bc49e32330108b1ea9f85ffb80a2cd' into eclair-plus-aosp
* commit '
859f455645bc49e32330108b1ea9f85ffb80a2cd':
Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.
Dirk Dougherty [Wed, 10 Feb 2010 02:41:32 +0000 (18:41 -0800)]
Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair
Adam Powell [Tue, 9 Feb 2010 21:19:25 +0000 (13:19 -0800)]
Manually merged VelocityTracker changes
Adam Powell [Tue, 9 Feb 2010 18:55:57 +0000 (10:55 -0800)]
am
e88192b9: Cleanup fixes for ScaleGestureDetector
Merge commit '
e88192b9d2a8c364d8545471907c5baa275bb5f6' into eclair-plus-aosp
* commit '
e88192b9d2a8c364d8545471907c5baa275bb5f6':
Cleanup fixes for ScaleGestureDetector
Suchi Amalapurapu [Tue, 9 Feb 2010 01:27:33 +0000 (17:27 -0800)]
am
08be55b8: Add null checks when scanning a package. Delete packages whose code and resource paths haven\'t been set correctly.
Merge commit '
08be55b8ea917a5273c135a7bdc73e41c8524c05' into eclair-plus-aosp
* commit '
08be55b8ea917a5273c135a7bdc73e41c8524c05':
Add null checks when scanning a package.
The Android Open Source Project [Fri, 5 Feb 2010 21:55:16 +0000 (13:55 -0800)]
merge from open-source master
Adam Powell [Fri, 5 Feb 2010 21:01:22 +0000 (13:01 -0800)]
Merge "Use a circular buffer in VelocityTracker"
Romain Guy [Fri, 5 Feb 2010 18:33:44 +0000 (10:33 -0800)]
Merge "Fix x coordinate of the ACTION_UP event in TouchUtils.drag() method"
The Android Open Source Project [Fri, 5 Feb 2010 16:48:38 +0000 (08:48 -0800)]
am
31bfdf69: reconcile main tree with open-source eclair
Merge commit '
31bfdf695ef741f64066ef605bd6a7e23df88714' into eclair-plus-aosp
* commit '
31bfdf695ef741f64066ef605bd6a7e23df88714':
android-2.1_r1 snapshot
Use 128p map tiles for high dpi devices.
Throttle nitz updates as the are too numerous on cdma.
don't request a sync when temp providers are created
Increase light sensor delay from one to two seconds.
Revert jparks code from IPCThreadState.
Add a warning when we leave threads in the binder thread pool in the background scheduling group.
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Fix regression.
Fix broken build.
Bluetooth A2DP suspend/resume functionality
EventLog when a database file is deleted due to corruption.
Don't forget to clear "backup in progress" state when finishing a pass
Fix issue #
2148939: Sholes slow to wake up in landscape mode
Fix Cdma re-start of default connection.
Merge change 26821 into eclair
Not all WebView's host have permission to read the history.
Merge change 26908 into eclair
The Android Open Source Project [Fri, 5 Feb 2010 16:09:38 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
Eric Laurent [Thu, 4 Feb 2010 17:34:34 +0000 (09:34 -0800)]
am
aead64de: Fix issue:
2413494: [Passion-c] Add TTY support.
Merge commit '
aead64def1fe58c95c086a0ca00cf0b13fa32ef1' into eclair-plus-aosp
* commit '
aead64def1fe58c95c086a0ca00cf0b13fa32ef1':
Fix issue:
2413494: [Passion-c] Add TTY support.
Katie McCormick [Thu, 4 Feb 2010 04:21:26 +0000 (20:21 -0800)]
am
8a6c0607: Merge "SDK doc change: Fixed typo--fingure->finger Bug:
1993220" into eclair
Merge commit '
8a6c060719c8870f370b82faa48ae2f437915214' into eclair-plus-aosp
* commit '
8a6c060719c8870f370b82faa48ae2f437915214':
SDK doc change: Fixed typo--fingure->finger
Katie McCormick [Thu, 4 Feb 2010 00:52:18 +0000 (16:52 -0800)]
Merge "SDK doc change: Fixed typo--fingure->finger Bug:
1993220" into eclair
Scott Main [Thu, 4 Feb 2010 00:18:17 +0000 (16:18 -0800)]
am
98a9fc0a: Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair
Merge commit '
98a9fc0a0025a3df7b36f7752fc330eba8810603' into eclair-plus-aosp
* commit '
98a9fc0a0025a3df7b36f7752fc330eba8810603':
docs: revise the Style and Themes document to improve the
Scott Main [Thu, 4 Feb 2010 00:11:41 +0000 (16:11 -0800)]
Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair
Megha Joshi [Wed, 3 Feb 2010 20:29:19 +0000 (12:29 -0800)]
am
9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclair
Merge commit '
9f4cfc3afcdf9f7be096b3243bfc15b9346b8434' into eclair-plus-aosp
* commit '
9f4cfc3afcdf9f7be096b3243bfc15b9346b8434':
Screenshots for sample syncadapter.
Megha Joshi [Wed, 3 Feb 2010 20:24:20 +0000 (12:24 -0800)]
Merge "Screenshots for sample syncadapter." into eclair
Mike Lockwood [Sat, 30 Jan 2010 04:12:21 +0000 (20:12 -0800)]
am
a0460004: Merge "Ignore NTP time fixes that differ from system time by more than 5 minutes." into eclair
Merge commit '
a0460004aae7576114639393a230f18608d213e6' into eclair-plus-aosp
* commit '
a0460004aae7576114639393a230f18608d213e6':
Ignore NTP time fixes that differ from system time by more than 5 minutes.
John Wang [Sat, 30 Jan 2010 04:12:15 +0000 (20:12 -0800)]
am
8deed914: Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair
Merge commit '
8deed914c2df15d71674deae591bcd3313093931' into eclair-plus-aosp
* commit '
8deed914c2df15d71674deae591bcd3313093931':
Handle RIL_UNSOL_RESEND_INCALL_MUTE.
Mike Lockwood [Sat, 30 Jan 2010 04:09:16 +0000 (20:09 -0800)]
Merge "Ignore NTP time fixes that differ from system time by more than 5 minutes." into eclair
John Wang [Sat, 30 Jan 2010 04:07:14 +0000 (20:07 -0800)]
Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair
Jim Miller [Sat, 30 Jan 2010 02:06:48 +0000 (18:06 -0800)]
am
d8a3a895: Fix
2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
Merge commit '
d8a3a8957b9d71ab75584b0cc98324fd70cc527c' into eclair-plus-aosp
* commit '
d8a3a8957b9d71ab75584b0cc98324fd70cc527c':
Fix
2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
The Android Open Source Project [Fri, 29 Jan 2010 22:09:16 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot
Scott Main [Fri, 29 Jan 2010 21:47:40 +0000 (13:47 -0800)]
am
9800adf2: Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair
Merge commit '
9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8' into eclair-plus-aosp
* commit '
9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8':
docs: update web page debugging with info about page and line
Dirk Dougherty [Fri, 29 Jan 2010 21:47:28 +0000 (13:47 -0800)]
am
196ec566: Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair
Merge commit '
196ec566b39340942f146ce4a9af775f4c648d2d' into eclair-plus-aosp
* commit '
196ec566b39340942f146ce4a9af775f4c648d2d':
SDK doc change: Increment the platform version var used in doc footer and elsewhere.
Scott Main [Fri, 29 Jan 2010 21:40:53 +0000 (13:40 -0800)]
Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair
Dirk Dougherty [Fri, 29 Jan 2010 01:59:24 +0000 (17:59 -0800)]
Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair
Dirk Dougherty [Fri, 29 Jan 2010 00:46:54 +0000 (16:46 -0800)]
am
7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair
Merge commit '
7b00a8ae71c5964cb96e1663b778658eaa069b3e' into eclair-plus-aosp
* commit '
7b00a8ae71c5964cb96e1663b778658eaa069b3e':
SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
Dirk Dougherty [Fri, 29 Jan 2010 00:40:56 +0000 (16:40 -0800)]
Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair
Grace Kloba [Wed, 27 Jan 2010 20:30:19 +0000 (12:30 -0800)]
am
769ed21c: Fix http://b/issue?id=
2400423.
Merge commit '
769ed21c33c3629411eb3bbf924de45737a18067' into eclair-plus-aosp
* commit '
769ed21c33c3629411eb3bbf924de45737a18067':
Fix http://b/issue?id=
2400423.
Dirk Dougherty [Wed, 27 Jan 2010 02:05:23 +0000 (18:05 -0800)]
am
965f4a6b: Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair
Merge commit '
965f4a6b4b5f3dd71e70f427af0c8a902e5880ef' into eclair-plus-aosp
* commit '
965f4a6b4b5f3dd71e70f427af0c8a902e5880ef':
doc change only: Update announcement and mwc redirect to point to microsite.
Dirk Dougherty [Wed, 27 Jan 2010 02:00:29 +0000 (18:00 -0800)]
Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair
Jim Miller [Tue, 26 Jan 2010 21:55:16 +0000 (13:55 -0800)]
am
9985867a: Fix
2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
Merge commit '
9985867a8eb80c6db84c80a9b5e96bd68e2d14d7' into eclair-plus-aosp
* commit '
9985867a8eb80c6db84c80a9b5e96bd68e2d14d7':
Fix
2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
Robert Greenwalt [Tue, 26 Jan 2010 02:56:32 +0000 (18:56 -0800)]
am
cc4b4016: Fix the reporting of NO_CONNECTIVITY.
Merge commit '
cc4b4016e4b86db012f94bb889e5ca61ff362171' into eclair-plus-aosp
* commit '
cc4b4016e4b86db012f94bb889e5ca61ff362171':
Fix the reporting of NO_CONNECTIVITY.
Robert Greenwalt [Tue, 26 Jan 2010 00:54:28 +0000 (16:54 -0800)]
am
5381e4ef: Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair
Merge commit '
5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750' into eclair-plus-aosp
* commit '
5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750':
Refine fix I53e91db7 to apply only to wifi network
Scott Main [Tue, 26 Jan 2010 00:54:20 +0000 (16:54 -0800)]
am
d243bc71: Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug:
1909300" into eclair
Merge commit '
d243bc710c92e56974f52449d24e2c6b8dd0ef9e' into eclair-plus-aosp
* commit '
d243bc710c92e56974f52449d24e2c6b8dd0ef9e':
docs: reference the history JS file with docRoot in order to
Robert Greenwalt [Tue, 26 Jan 2010 00:50:10 +0000 (16:50 -0800)]
Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair
Scott Main [Mon, 25 Jan 2010 23:39:46 +0000 (15:39 -0800)]
Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug:
1909300" into eclair
Mike Reed [Mon, 25 Jan 2010 14:24:35 +0000 (06:24 -0800)]
am
f904be16: Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair
Merge commit '
f904be1659fcc88dd80be2c900ffc89e77b1c737' into eclair-plus-aosp
* commit '
f904be1659fcc88dd80be2c900ffc89e77b1c737':
disable high-quality filtering during scrolling, until I can cached the scaled images.
Mike Reed [Mon, 25 Jan 2010 14:19:17 +0000 (06:19 -0800)]
Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair
Jim Miller [Sat, 23 Jan 2010 04:23:37 +0000 (20:23 -0800)]
am
2e4e25f3: Merge "Fix
2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair
Merge commit '
2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc' into eclair-plus-aosp
* commit '
2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc':
Fix
2287263: Change carrier TextView to be 1 line and marquee if text is too long.
Jim Miller [Sat, 23 Jan 2010 04:19:12 +0000 (20:19 -0800)]
Merge "Fix
2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair
Dirk Dougherty [Sat, 23 Jan 2010 00:50:03 +0000 (16:50 -0800)]
am
84207956: Merge "SDK doc change: Misc small fixes." into eclair
Merge commit '
8420795633443221627eb872aea8f2862a38f8b1' into eclair-plus-aosp
* commit '
8420795633443221627eb872aea8f2862a38f8b1':
SDK doc change: Misc small fixes.
Dirk Dougherty [Sat, 23 Jan 2010 00:49:57 +0000 (16:49 -0800)]
am
c5de95bf: Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair
Merge commit '
c5de95bf25fda1a5e7f36f1229b0dd8d19c67f5a' into eclair-plus-aosp
* commit '
c5de95bf25fda1a5e7f36f1229b0dd8d19c67f5a':
SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.
Dirk Dougherty [Sat, 23 Jan 2010 00:45:58 +0000 (16:45 -0800)]
Merge "SDK doc change: Misc small fixes." into eclair
Dirk Dougherty [Sat, 23 Jan 2010 00:38:59 +0000 (16:38 -0800)]
Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair
Dianne Hackborn [Fri, 22 Jan 2010 23:51:02 +0000 (15:51 -0800)]
am
678e66a4: Merge "Fix issue #
2391429: Crash during boot if fwd locked app is incompletely installed" into eclair
Merge commit '
678e66a4ec8bdceafd12f7d82c7d4aa8acf71aa2' into eclair-plus-aosp
* commit '
678e66a4ec8bdceafd12f7d82c7d4aa8acf71aa2':
Fix issue #
2391429: Crash during boot if fwd locked app is incompletely installed
Dianne Hackborn [Fri, 22 Jan 2010 23:47:08 +0000 (15:47 -0800)]
Merge "Fix issue #
2391429: Crash during boot if fwd locked app is incompletely installed" into eclair
Dirk Dougherty [Fri, 22 Jan 2010 22:28:05 +0000 (14:28 -0800)]
am
5d14cb34: Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair
Merge commit '
5d14cb34c0e9760340c15ac5faf2d76a64797117' into eclair-plus-aosp
* commit '
5d14cb34c0e9760340c15ac5faf2d76a64797117':
doc change: add announce for developer lab at mwc. move adc to carousel.
Dirk Dougherty [Fri, 22 Jan 2010 22:23:39 +0000 (14:23 -0800)]
Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair
John Wang [Fri, 22 Jan 2010 21:20:25 +0000 (13:20 -0800)]
am
098295a5: Merge "Updated emergency string when locale changes." into eclair
Merge commit '
098295a5a3e840e94040ce38eb08eb6c72b2a7e0' into eclair-plus-aosp
* commit '
098295a5a3e840e94040ce38eb08eb6c72b2a7e0':
Updated emergency string when locale changes.
Grace Kloba [Fri, 22 Jan 2010 21:17:52 +0000 (13:17 -0800)]
John Wang [Fri, 22 Jan 2010 21:17:25 +0000 (13:17 -0800)]
Merge "Updated emergency string when locale changes." into eclair
Eric Laurent [Fri, 22 Jan 2010 18:25:00 +0000 (10:25 -0800)]
am
a59551ba: Merge "Fix issue
2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair
Merge commit '
a59551bade6a7b0c916c277f044de79c6af1bd22' into eclair-plus-aosp
* commit '
a59551bade6a7b0c916c277f044de79c6af1bd22':
Fix issue
2388215: Audio not routed to 3.5mm Headset after removal/insertion.
John Wang [Fri, 22 Jan 2010 18:24:47 +0000 (10:24 -0800)]
am
08cb0024: Handle emergency calls only status in ServiceStateTracker.
Merge commit '
08cb0024026e0f42612ab569e1e4067d5ede3bf8' into eclair-plus-aosp
* commit '
08cb0024026e0f42612ab569e1e4067d5ede3bf8':
Handle emergency calls only status in ServiceStateTracker.
Eric Laurent [Fri, 22 Jan 2010 18:14:26 +0000 (10:14 -0800)]
Merge "Fix issue
2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair
Fred Quintana [Fri, 22 Jan 2010 01:35:28 +0000 (17:35 -0800)]
am
9a400fa4: Merge "initialize sync adapters that get installed while the system is running bug b/issue?id=
2360782" into eclair
Merge commit '
9a400fa4d3e89a3ab3669c0aa2ef6676020646d1' into eclair-plus-aosp
* commit '
9a400fa4d3e89a3ab3669c0aa2ef6676020646d1':
initialize sync adapters that get installed while the system is running
jsh [Fri, 22 Jan 2010 01:35:18 +0000 (17:35 -0800)]
am
036e2108: Fix NPE when importing from USIM.
Merge commit '
036e21083d9936425687d7de29e95b2c458a7e4a' into eclair-plus-aosp
* commit '
036e21083d9936425687d7de29e95b2c458a7e4a':
Fix NPE when importing from USIM.
Fred Quintana [Fri, 22 Jan 2010 01:30:07 +0000 (17:30 -0800)]
Merge "initialize sync adapters that get installed while the system is running bug b/issue?id=
2360782" into eclair
Yu Shan Emily Lau [Thu, 21 Jan 2010 23:14:36 +0000 (15:14 -0800)]
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.
Eric Fischer [Thu, 21 Jan 2010 23:14:30 +0000 (15:14 -0800)]
am
50adb167: Pull in "emergency calls only" translations.
Merge commit '
50adb167534889421dc0d7cfc7d3bf663c03f01c' into eclair-plus-aosp
* commit '
50adb167534889421dc0d7cfc7d3bf663c03f01c':
Pull in "emergency calls only" translations.
Yu Shan Emily Lau [Thu, 21 Jan 2010 23:07:51 +0000 (15:07 -0800)]
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
John Wang [Thu, 21 Jan 2010 22:06:35 +0000 (14:06 -0800)]
am
7f70998d: Merge "Add Emergency Calls Only String." into eclair
Merge commit '
7f70998dec6d7db850373b7e75677ecf72904878' into eclair-plus-aosp
* commit '
7f70998dec6d7db850373b7e75677ecf72904878':
Add Emergency Calls Only String.
John Wang [Thu, 21 Jan 2010 21:38:32 +0000 (13:38 -0800)]
Merge "Add Emergency Calls Only String." into eclair
Wei Huang [Thu, 21 Jan 2010 20:28:08 +0000 (12:28 -0800)]
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.
Wei Huang [Thu, 21 Jan 2010 20:21:11 +0000 (12:21 -0800)]
Merge "fix bug
2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair
The Android Open Source Project [Thu, 21 Jan 2010 19:21:25 +0000 (11:21 -0800)]
merge from open-source master
Ying Wang [Thu, 21 Jan 2010 19:12:29 +0000 (11:12 -0800)]
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.
Ying Wang [Thu, 21 Jan 2010 19:07:14 +0000 (11:07 -0800)]
Merge "Find layout classes in all "layout-*" dirs." into eclair
Robert Greenwalt [Thu, 21 Jan 2010 18:05:13 +0000 (10:05 -0800)]
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.
Robert Greenwalt [Thu, 21 Jan 2010 17:57:46 +0000 (09:57 -0800)]
Merge "Try to switch to another default net on connection failure." into eclair
Irfan Sheriff [Thu, 21 Jan 2010 15:52:52 +0000 (07:52 -0800)]
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
Irfan Sheriff [Thu, 21 Jan 2010 15:46:49 +0000 (07:46 -0800)]
Merge "Use MCC value to always override channel count setting" into eclair
Grace Kloba [Thu, 21 Jan 2010 07:34:42 +0000 (23:34 -0800)]
am
f6aed0e0: Merge "DO NOT MERGE" into eclair
Merge commit '
f6aed0e0a7c96094b66f5426baad78032b794497' into eclair-plus-aosp
* commit '
f6aed0e0a7c96094b66f5426baad78032b794497':
DO NOT MERGE
Grace Kloba [Thu, 21 Jan 2010 07:30:05 +0000 (23:30 -0800)]
Merge "DO NOT MERGE" into eclair
Grace Kloba [Thu, 21 Jan 2010 07:26:03 +0000 (23:26 -0800)]
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
Nick Pelly [Thu, 21 Jan 2010 04:46:35 +0000 (20:46 -0800)]
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.
OSDN Git Service
