Commit Graph

4038 Commits

Author SHA1 Message Date
Android (Google) Code Review
4798fd6c0a Merge change 23539 into eclair
* changes:
  Squashed commit of the following:
2009-09-02 09:22:49 -07:00
Android (Google) Code Review
214cf493e4 Merge change 23527 into eclair
* changes:
  Adding a convenience method to resolve contact lookup URI to a regular content URI
2009-09-02 08:38:32 -07:00
Android (Google) Code Review
3e0038f523 Merge change 23609 into eclair
* changes:
  Fix SDK build breakage.
2009-09-02 00:07:09 -07:00
Android (Google) Code Review
1bb4f3561f Merge change 23585 into eclair
* changes:
  Print error message if the buffer size is too small.
2009-09-01 23:49:42 -07:00
Android (Google) Code Review
7977859eae Merge change 23425 into eclair
* changes:
  Store CA certificate chain into one single key entry with PEM format.
2009-09-01 23:23:41 -07:00
Android (Google) Code Review
02db7d0371 Merge change 23582 into eclair
* changes:
  Expand apps' control over the settings restore process
2009-09-01 21:00:59 -07:00
Android (Google) Code Review
766ba2e41d Merge change 23583 into eclair
* changes:
  Update fountain to use structures.
2009-09-01 20:42:19 -07:00
Android (Google) Code Review
0d4ab1e3d5 Merge change 23463 into eclair
* changes:
  Wait for HCI to come up if getting the adapter path fails.
2009-09-01 19:19:47 -07:00
Dianne Hackborn
6fbbccc4a2 am c804efe2: Merge change 23569 into donut
Merge commit 'c804efe278fa33555e6e836504a467cb14505eb3' into eclair

* commit 'c804efe278fa33555e6e836504a467cb14505eb3':
  Update 4.xml to the most recent APIs.
2009-09-01 19:18:18 -07:00
Android (Google) Code Review
1f03cab9f9 Merge change 23569 into donut
* changes:
  Update 4.xml to the most recent APIs.
2009-09-01 19:15:59 -07:00
Dianne Hackborn
07a29fc9f8 am 6a98f8d9: Merge change 23499 into donut
Merge commit '6a98f8d93e4ddd407baad8d9b7481a892001d281' into eclair

* commit '6a98f8d93e4ddd407baad8d9b7481a892001d281':
  Fix content provider
2009-09-01 19:11:44 -07:00
Android (Google) Code Review
de9306e573 Merge change 23499 into donut
* changes:
  Fix content provider
2009-09-01 19:09:24 -07:00
Scott Main
8782fa2205 am dc516413: Merge change 23503 into donut
Merge commit 'dc5164134c507f747f1cf89c01e4fb5e724eccd4' into eclair

* commit 'dc5164134c507f747f1cf89c01e4fb5e724eccd4':
  docs only.
2009-09-01 19:07:10 -07:00
Android (Google) Code Review
245e5ecd6a Merge change 23503 into donut
* changes:
  docs only. expand the uses-feature docs
2009-09-01 19:04:15 -07:00
Scott Main
0478d2b74c am 4e60d012: docs only. add syntax samples for all attributes and revise targetSdkVersion information.
Merge commit '4e60d012c95f50ddd2a1ba6202e4fec3c9cfd3df' into eclair

* commit '4e60d012c95f50ddd2a1ba6202e4fec3c9cfd3df':
  docs only.
2009-09-01 18:48:34 -07:00
Android (Google) Code Review
1a863c2f3e Merge change 23376 into eclair
* changes:
  - don't schedule syncs that we will never dispatch - expedite the INITIALIZATION sync
2009-09-01 17:38:25 -07:00
Android (Google) Code Review
104e15eac2 Merge change 23542 into eclair
* changes:
  Modify the gain after filtering to prevent TTS clipping in en-US.
2009-09-01 16:19:14 -07:00
Android (Google) Code Review
f44bbdea0b Merge change 23506 into eclair
* changes:
  dumpstate: Add support for apanic crash data
2009-09-01 15:40:28 -07:00
Android (Google) Code Review
6a25ac6e54 Merge change 23462 into eclair
* changes:
  Add Bluetooth Device trust
2009-09-01 14:10:06 -07:00
Android (Google) Code Review
c8993dc828 Merge change 23461 into eclair
* changes:
  Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider
2009-09-01 13:09:25 -07:00
Android (Google) Code Review
bf6bef8982 Merge change 23474 into eclair
* changes:
  Breaking sleep after yield into small quanta.
2009-09-01 13:03:58 -07:00
Android (Google) Code Review
acdf24d076 Merge change 23403 into eclair
* changes:
  Various infrastructure to support a running services UI.
2009-09-01 12:31:31 -07:00
Android (Google) Code Review
cb01fd10ff Merge change 23469 into eclair
* changes:
  Set a default dump type for DRT as a workaround for indeterministic order in receiving dumpAsText and onPageFinish callback.
2009-09-01 12:03:39 -07:00
Android (Google) Code Review
28fc36b59b Merge change 23464 into eclair
* changes:
  Create new hdpi versions of 1x data statusbar icons.
2009-09-01 11:49:45 -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
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
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
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
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
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
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
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
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
Android (Google) Code Review
d1ffe3e2fe Merge change 23402 into eclair
* changes:
  Fix 2081525: NPE in MediaScannerService.
2009-08-31 22:33:41 -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
Android (Google) Code Review
d83b44d831 Merge change 23271 into eclair
* changes:
  Cleanup egregious style issues.
2009-08-31 19:45:05 -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
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
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
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
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
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
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
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
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
Android (Google) Code Review
e7a419e7fa Merge change 23356 into eclair
* changes:
  Temporarily unlock our mutex while fetching a buffer from the upstream source.
2009-08-31 16:44:46 -07:00
Android (Google) Code Review
f36e598194 Merge change 23357 into eclair
* changes:
  Fix double-free problem in EmojiFactory.
2009-08-31 16:33:10 -07:00