Commit Graph

4224 Commits

Author SHA1 Message Date
Eric Fischer
c5ff11ecd5 am b7559e02: am 56205fea: Merge change 23345 into donut
Merge commit 'b7559e02803266e5fa9f4496174bc343ecd245ab' into eclair-plus-aosp

* commit 'b7559e02803266e5fa9f4496174bc343ecd245ab':
  Fix an emoji-measuring bug that caused an exception when editing a contact.
2009-09-01 11:20:35 -07:00
Eric Fischer
4ce160e5e7 am 56205fea: Merge change 23345 into donut
Merge commit '56205fea879543a50bb797016832416a8b48cabb' into eclair

* commit '56205fea879543a50bb797016832416a8b48cabb':
  Fix an emoji-measuring bug that caused an exception when editing a contact.
2009-09-01 11:18:43 -07:00
Android (Google) Code Review
7a758262de Merge change 23345 into donut
* changes:
  Fix an emoji-measuring bug that caused an exception when editing a contact.
2009-09-01 11:16:25 -07:00
Eric Laurent
45ecde990e am 46c15823: Merge change 23105 into eclair
Merge commit '46c158234dee0d1d47f06b7661150c18512dc589' into eclair-plus-aosp

* commit '46c158234dee0d1d47f06b7661150c18512dc589':
  Fix issue 2077333: The volume key will effect both ring and media vol at the same time.
2009-09-01 11:15:42 -07:00
Android (Google) Code Review
7ce2a71d9f Merge change 23105 into eclair
* changes:
  Fix issue 2077333: The volume key will effect both ring and media vol at the same time.
2009-09-01 11:14:00 -07:00
Guang Zhu
040e69d4d5 am d9942b5c: Merge change 23450 into eclair
Merge commit 'd9942b5cb1662638bb6fb57c12a06976e3c34651' into eclair-plus-aosp

* commit 'd9942b5cb1662638bb6fb57c12a06976e3c34651':
  At leaset log the layout test timeouts
2009-09-01 10:27:23 -07:00
Android (Google) Code Review
0e1151b073 Merge change 23450 into eclair
* changes:
  At leaset log the layout test timeouts
2009-09-01 10:24:38 -07:00
Cary Clark
26256ec4f7 am 169ae05f: Merge change 23439 into eclair
Merge commit '169ae05f9f5cce400dd936e2a31676b80d84b862' into eclair-plus-aosp

* commit '169ae05f9f5cce400dd936e2a31676b80d84b862':
  if exception getMessage() is null, don't add it to the error
2009-09-01 10:15:51 -07:00
Eric Laurent
988b2f8007 am b51b4098: Merge change 23438 into eclair
Merge commit 'b51b40982d06813bd3b325b4f0d1fa698ab3f897' into eclair-plus-aosp

* commit 'b51b40982d06813bd3b325b4f0d1fa698ab3f897':
  Fix issue 2091594: music chirp after disconnecting A2DP.
2009-09-01 10:14:14 -07:00
Android (Google) Code Review
1699a78614 Merge change 23439 into eclair
* changes:
  if exception getMessage() is null, don't add it to the error
2009-09-01 10:14:10 -07:00
Android (Google) Code Review
9f29120f05 Merge change 23438 into eclair
* changes:
  Fix issue 2091594: music chirp after disconnecting A2DP.
2009-09-01 09:57:53 -07:00
Grace Kloba
e35e3b7c8c am 5e2a385c: Merge change 23395 into eclair
Merge commit '5e2a385c0d95f4a99dd8c562c6d2d79aa8546030' into eclair-plus-aosp

* commit '5e2a385c0d95f4a99dd8c562c6d2d79aa8546030':
  When we get 304 and switch to cacheLoader, need to set mFromCache to be true.
2009-09-01 09:17:47 -07:00
Android (Google) Code Review
d06abf0caf Merge change 23395 into eclair
* changes:
  When we get 304 and switch to cacheLoader, need to set mFromCache to be true. So that the cache loading will not create a new mCacheResult which overwrites the old cache data.
2009-09-01 09:15:45 -07:00
Patrick Scott
e47bf8719c am 05a6f3cd: Merge change 23434 into eclair
Merge commit '05a6f3cde52e5fbbad5187615bfc87d58559161f' into eclair-plus-aosp

* commit '05a6f3cde52e5fbbad5187615bfc87d58559161f':
  Fix a docs comment to match the parameter name.
2009-09-01 07:21:59 -07:00
Android (Google) Code Review
5683fbf326 Merge change 23434 into eclair
* changes:
  Fix a docs comment to match the parameter name.
2009-09-01 07:20:18 -07:00
Cary Clark
c0c6d833b2 am 278ce05b: accelerate consecutive flings
Merge commit '278ce05b52a47a09d2177435b533f4ecb1b9c4da' into eclair-plus-aosp

* commit '278ce05b52a47a09d2177435b533f4ecb1b9c4da':
  accelerate consecutive flings
2009-09-01 06:37:47 -07:00
Eric Laurent
0643771ad0 Fix issue 2091594: music chirp after disconnecting A2DP.
In AudioFlinger::MixerThread::putTracks(), change the mFillingUpStatus flag to FS_FILLING for active tracks so that mute request is executed without ramping volume down when the track is moved from A2DP to hardware output.
Also modified AudioFlinger::setStreamOutput() so that the notification of the change is sent only once to AudioSystem.
2009-09-01 05:56:26 -07:00
Patrick Scott
0ec310d693 am 05c9ed9c: Fix the documentation for onReceivedError.
Merge commit '05c9ed9ce1d920c322ee1431cfed64541f0acf3c' into eclair-plus-aosp

* commit '05c9ed9ce1d920c322ee1431cfed64541f0acf3c':
  Fix the documentation for onReceivedError.
2009-09-01 05:40:53 -07:00
Steve Block
95cebbfc88 am 0c637113: Merge change 23427 into eclair
Merge commit '0c637113381cb49fbb83cf0e753e476d0d0d50eb' into eclair-plus-aosp

* commit '0c637113381cb49fbb83cf0e753e476d0d0d50eb':
  Moves GoogleLocationSettingManager to its correct location.
2009-09-01 05:25:16 -07:00
Android (Google) Code Review
f3d8967444 Merge change 23427 into eclair
* changes:
  Moves GoogleLocationSettingManager to its correct location.
2009-09-01 05:23:26 -07:00
Mike Lockwood
7d4547e4b7 am 84c4548d: Merge changes 23429,23430 into eclair
Merge commit '84c4548d046c7426cd346602cec18b98fdcdbf3c' into eclair-plus-aosp

* commit '84c4548d046c7426cd346602cec18b98fdcdbf3c':
  LocationManagerService: Remove caching of last known locations to flash.
  LocationManagerService: Add null pointer check and remove useless finalize() method.
2009-09-01 05:03:47 -07:00
Tammo Spalink
d3cbb47181 am c98d68cd: Merge change 22886 into eclair
Merge commit 'c98d68cd56338ec57695b3c35114fbde88d4bde8' into eclair-plus-aosp

* commit 'c98d68cd56338ec57695b3c35114fbde88d4bde8':
  Move SMS pdu creation fully into the central Phone process.
2009-09-01 05:03:42 -07:00
Android (Google) Code Review
2281afdb62 Merge changes 23429,23430 into eclair
* changes:
  LocationManagerService: Remove caching of last known locations to flash.
  LocationManagerService: Add null pointer check and remove useless finalize() method.
2009-09-01 05:01:26 -07:00
Android (Google) Code Review
ae4d3a4f42 Merge change 22886 into eclair
* changes:
  Move SMS pdu creation fully into the central Phone process.
2009-08-31 22:39:22 -07:00
Chih-Chung Chang
f668bcba13 am 808c739a: Merge change 23402 into eclair
Merge commit '808c739a9428b11a811659403bbb46a0814a2928' into eclair-plus-aosp

* commit '808c739a9428b11a811659403bbb46a0814a2928':
  Fix 2081525: NPE in MediaScannerService.
2009-08-31 22:35:51 -07:00
Android (Google) Code Review
d1ffe3e2fe Merge change 23402 into eclair
* changes:
  Fix 2081525: NPE in MediaScannerService.
2009-08-31 22:33:41 -07:00
Guang Zhu
14f62a3fc6 am ce54003a: Merge change 23406 into eclair
Merge commit 'ce54003aa8961764763c4045991b730974fa9083' into eclair-plus-aosp

* commit 'ce54003aa8961764763c4045991b730974fa9083':
  allow a longer timeout for layout tests, see if it stabilizes pass/fail numbers
2009-08-31 22:06:30 -07:00
Android (Google) Code Review
9cd2747f43 Merge change 23406 into eclair
* changes:
  allow a longer timeout for layout tests, see if it stabilizes pass/fail numbers
2009-08-31 22:04:09 -07:00
Tammo Spalink
feb855f014 am 95434bfa: Allow fragmentText to be called for singleton CDMA messages.
Merge commit '95434bfaee62161ce02012c6424f0c0c8fffccb5' into eclair-plus-aosp

* commit '95434bfaee62161ce02012c6424f0c0c8fffccb5':
  Allow fragmentText to be called for singleton CDMA messages.
2009-08-31 20:49:10 -07:00
Tammo Spalink
fa64a45c02 am 33567c5f: Merge change 23271 into eclair
Merge commit '33567c5f3dab39cbb8c526c919e7e526042d1acf' into eclair-plus-aosp

* commit '33567c5f3dab39cbb8c526c919e7e526042d1acf':
  Cleanup egregious style issues.
2009-08-31 19:46:56 -07:00
Android (Google) Code Review
d83b44d831 Merge change 23271 into eclair
* changes:
  Cleanup egregious style issues.
2009-08-31 19:45:05 -07:00
Tammo Spalink
32a67a1849 am 650cbfd3: Merge change 22551 into eclair
Merge commit '650cbfd3815382df1a82c52297f641bfe9cc4f73' into eclair-plus-aosp

* commit '650cbfd3815382df1a82c52297f641bfe9cc4f73':
  Fix broken unit test.
2009-08-31 19:42:23 -07:00
Android (Google) Code Review
045a8839a1 Merge change 22551 into eclair
* changes:
  Fix broken unit test.
2009-08-31 19:39:40 -07:00
Scott Main
559cf47b7c am 2bd4326a: am 5126d3a3: docs only. revise samples link for offline docs to point to the current version
Merge commit '2bd4326a4694ea3055dc758c05533c905ad78291' into eclair-plus-aosp

* commit '2bd4326a4694ea3055dc758c05533c905ad78291':
  docs only.
2009-08-31 19:03:05 -07:00
Scott Main
7185132c5a am 5126d3a3: docs only. revise samples link for offline docs to point to the current version
Merge commit '5126d3a3794c8c5e1e61621daa5e9dab050b44a1' into eclair

* commit '5126d3a3794c8c5e1e61621daa5e9dab050b44a1':
  docs only.
2009-08-31 19:00:45 -07:00
Fred Quintana
00678723df am 34b6a27e: Merge change 23375 into eclair
Merge commit '34b6a27ea38adeea54a488efc6bbd04c58cb8a91' into eclair-plus-aosp

* commit '34b6a27ea38adeea54a488efc6bbd04c58cb8a91':
  re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()
2009-08-31 18:53:12 -07:00
Android (Google) Code Review
bd9d6651de Merge change 23375 into eclair
* changes:
  re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()
2009-08-31 18:51:04 -07:00
Xavier Ducrohet
ec7d8f482f am e23ef102: Merge change 23363 into eclair
Merge commit 'e23ef1023a4e4bd91a68c41c81ba273656a2c3a7' into eclair-plus-aosp

* commit 'e23ef1023a4e4bd91a68c41c81ba273656a2c3a7':
  Add error output to pm for FAILED_MISSING_FEATURE
2009-08-31 18:16:31 -07:00
Android (Google) Code Review
e35be14a5f Merge change 23363 into eclair
* changes:
  Add error output to pm for FAILED_MISSING_FEATURE
2009-08-31 18:13:24 -07:00
Romain Guy
19c902f161 am 0f44220b: Merge change 23381 into eclair
Merge commit '0f44220b34e346ef333cdb4cd4b4903b5212dad2' into eclair-plus-aosp

* commit '0f44220b34e346ef333cdb4cd4b4903b5212dad2':
  Prevent ListView from scrolling/flinging its content when the content fits on screen.
2009-08-31 17:48:14 -07:00
Android (Google) Code Review
ff309964c4 Merge change 23381 into eclair
* changes:
  Prevent ListView from scrolling/flinging its content when the content fits on screen.
2009-08-31 17:46:47 -07:00
Jack Palevich
e589d52b08 am ad822197: Merge change 23380 into eclair
Merge commit 'ad82219718cd1751dcf84bab0cd1aedcb6805eb1' into eclair-plus-aosp

* commit 'ad82219718cd1751dcf84bab0cd1aedcb6805eb1':
  Change util_texSubImage2D to call glCompressedTexImage2D correctly.
2009-08-31 17:46:42 -07:00
Android (Google) Code Review
b5f85300f3 Merge change 23380 into eclair
* changes:
  Change util_texSubImage2D to call glCompressedTexImage2D correctly.
2009-08-31 17:45:03 -07:00
Joe Onorato
fe0969a8cb am ae209acd: Don\'t leak jni refs.
Merge commit 'ae209acd8d48755df7d49459b1bcbc3b8e20561d' into eclair-plus-aosp

* commit 'ae209acd8d48755df7d49459b1bcbc3b8e20561d':
  Don't leak jni refs.
2009-08-31 17:28:13 -07:00
Fred Quintana
0bd7470036 am ec5d9fb4: Merge change 23370 into eclair
Merge commit 'ec5d9fb47d180d84e3eff0b2138966579be6ac00' into eclair-plus-aosp

* commit 'ec5d9fb47d180d84e3eff0b2138966579be6ac00':
  Revert "- don't schedule syncs that we will never dispatch"
2009-08-31 17:26:43 -07:00
Android (Google) Code Review
ccf849deb8 Merge change 23370 into eclair
* changes:
  Revert "- don't schedule syncs that we will never dispatch"
2009-08-31 17:24:17 -07:00
Romain Guy
6f8b837158 am f428f8ae: Merge change 23329 into eclair
Merge commit 'f428f8aecea9ae7a258dfc05f4ad4563938f1ed5' into eclair-plus-aosp

* commit 'f428f8aecea9ae7a258dfc05f4ad4563938f1ed5':
  Load bitmap resources entirely from native code.
2009-08-31 17:17:13 -07:00
Android (Google) Code Review
1873627527 Merge change 23329 into eclair
* changes:
  Load bitmap resources entirely from native code.
2009-08-31 17:15:42 -07:00
Jaikumar Ganesh
ca8d0b56ad am c91ad28f: Merge change 23218 into eclair
Merge commit 'c91ad28ff9173971c1d886f884250b1e774a40a6' into eclair-plus-aosp

* commit 'c91ad28ff9173971c1d886f884250b1e774a40a6':
  Fix property being cleared when DeviceFound signal is received.
2009-08-31 16:54:37 -07:00
Android (Google) Code Review
aa4b7de121 Merge change 23218 into eclair
* changes:
  Fix property being cleared when DeviceFound signal is received.
2009-08-31 16:52:38 -07:00