Dirk Dougherty
|
f007f06d61
|
Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
|
2010-05-27 11:46:26 -07:00 |
|
Jeff Hamilton
|
5b4069e958
|
Merge "Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
|
2010-05-27 09:39:19 -07:00 |
|
Irfan Sheriff
|
cde682745c
|
Merge "Fix null pointer exception" into froyo
|
2010-05-26 21:32:29 -07:00 |
|
Dirk Dougherty
|
6667c7976f
|
Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
|
2010-05-26 18:31:38 -07:00 |
|
Dirk Dougherty
|
60f35bb2fe
|
Merge "Doc change: fix adt download page, misc doc fixes." into froyo
|
2010-05-26 16:49:46 -07:00 |
|
Irfan Sheriff
|
d50f8399fa
|
Merge "Fix escaping of characters" into froyo
|
2010-05-26 13:02:06 -07:00 |
|
Yu Shan Emily Lau
|
d5fa4a9f4f
|
Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo
|
2010-05-25 17:40:51 -07:00 |
|
Andreas Huber
|
5fed07aa18
|
Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
|
2010-05-20 11:11:39 -07:00 |
|
Scott Main
|
98ca2ec913
|
Merge "docs: add youtube video to highlights" into froyo
|
2010-05-19 20:24:18 -07:00 |
|
Scott Main
|
ee85a0abcb
|
Merge "doc: add developing and testing info to backup guide" into froyo
|
2010-05-19 19:29:19 -07:00 |
|
Scott Main
|
0c113f694c
|
Merge "docs: revise platform intro" into froyo
|
2010-05-19 12:05:52 -07:00 |
|
Suchi Amalapurapu
|
4f7c9354c5
|
Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
|
2010-05-18 14:51:55 -07:00 |
|
Jaikumar Ganesh
|
c6c11bdbe0
|
Merge "Removing STOPSHIP logs." into froyo
|
2010-05-18 14:48:05 -07:00 |
|
Scott Main
|
86080540cb
|
Merge "docs: fix markup error" into froyo
|
2010-05-18 08:59:03 -07:00 |
|
Scott Main
|
0c9d6432d5
|
Merge "docs: revise webview description and add info for targeting screen densities" into froyo
|
2010-05-17 17:59:37 -07:00 |
|
Chung-yih Wang
|
41613ed3bf
|
Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo
|
2010-05-14 23:15:04 -07:00 |
|
Dirk Dougherty
|
9b0f549757
|
Merge "Doc change: adjust compatibility doc." into froyo
|
2010-05-14 13:58:12 -07:00 |
|
Dirk Dougherty
|
2363a9d496
|
Merge "Doc change: adjustments to the api changes description" into froyo
|
2010-05-14 13:46:42 -07:00 |
|
Dirk Dougherty
|
c04d390b92
|
Merge "Doc change: add note about future instruction set support." into froyo
|
2010-05-14 13:43:19 -07:00 |
|
Dirk Dougherty
|
a3f10c57af
|
Merge "Doc change: documentation for library projects in sdk." into froyo
|
2010-05-14 13:38:20 -07:00 |
|
Dirk Dougherty
|
32374efa5f
|
Merge "Doc change: adjustments for ndk feature description" into froyo
|
2010-05-13 21:31:10 -07:00 |
|
Suchi Amalapurapu
|
60ef6d786f
|
Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
|
2010-05-13 16:02:20 -07:00 |
|
Costin Manolache
|
c7e64a8e4b
|
Merge "Bug 2680071: Rename the Cloud to Device" into froyo
|
2010-05-12 19:04:27 -07:00 |
|
Costin Manolache
|
b4490ffd58
|
Bug 2680071: Rename the Cloud to Device
Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
|
2010-05-12 16:16:34 -07:00 |
|
Scott Main
|
7a789c8b1a
|
Merge "docs: add missing path-permissions document" into froyo
|
2010-05-12 15:01:31 -07:00 |
|
Scott Main
|
003f8c3ea6
|
Merge "docs: fix broken links" into froyo
|
2010-05-12 14:53:35 -07:00 |
|
Dirk Dougherty
|
5d8d9f1ff1
|
Merge "Doc change: remove Google I/O 09 from carousel." into froyo
|
2010-05-12 11:05:03 -07:00 |
|
Scott Main
|
5f50306d26
|
Merge "docs: fix broken anchor names" into froyo
|
2010-05-11 20:13:26 -07:00 |
|
Dirk Dougherty
|
c42a5b0d6e
|
Merge "Doc change: update diff report 7-> 8" into froyo
|
2010-05-11 19:53:04 -07:00 |
|
Scott Main
|
2a2c699ffa
|
Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo
|
2010-05-11 19:25:19 -07:00 |
|
Brett Chabot
|
b7c34d1610
|
Merge "Fix imf tests." into froyo
|
2010-05-11 19:17:04 -07:00 |
|
Scott Main
|
6ff074cb78
|
Merge "docs: remove allowBackup attribute from documentation" into froyo
|
2010-05-11 15:25:38 -07:00 |
|
Xavier Ducrohet
|
4ef3c6a791
|
Merge "Hide two audio focus methods." into froyo
|
2010-05-11 14:48:48 -07:00 |
|
Marco Nelissen
|
ac1feedad2
|
Merge "Don't clear the _data column in the audio_meta table, since it isn't needed, and causes a sqlite constraint exception. Bug 2671792." into froyo
|
2010-05-11 14:36:16 -07:00 |
|
Dianne Hackborn
|
cd4d3b6287
|
Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo
|
2010-05-11 14:26:43 -07:00 |
|
Dirk Dougherty
|
0feef91d2b
|
Merge "Doc Change: Docs for NDK r4." into froyo
|
2010-05-11 14:20:24 -07:00 |
|
Scott Main
|
2577b83dfe
|
Merge "docs: announce froyo and update IO message" into froyo
|
2010-05-11 14:04:49 -07:00 |
|
Mike Lockwood
|
c9797fed88
|
Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
|
2010-05-11 13:26:25 -07:00 |
|
Andreas Huber
|
c5417a7da5
|
Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
|
2010-05-11 12:21:14 -07:00 |
|
Andreas Huber
|
1722e37f40
|
Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo
|
2010-05-11 12:20:55 -07:00 |
|
Costin Manolache
|
8e254d83ec
|
Merge "Bug 2673557: rename datamessaging" into froyo
|
2010-05-11 11:42:58 -07:00 |
|
Jean-Michel Trivi
|
edd2838a25
|
Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
|
2010-05-11 11:40:21 -07:00 |
|
Dirk Dougherty
|
6f29001ba5
|
Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo
|
2010-05-11 11:33:13 -07:00 |
|
Jean-Michel Trivi
|
d657af3915
|
Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the completion listener to not be called, which with the AudioFocus logic causes the Music app to pause and never resume. The NotificationPlayer modifications cause the MediaPlayer for the notification to only request audio focus when the data source is not empty. The audio focus code in AudioService is defensively synchronized against a unique lock, and the exception observed in bug 2670395 is explicitely caught in case another edge case wasn't caught by this fix. The AudioFocus handling in AudioManager is modified so only the requestAudioFocus and abandonAudioFocus methods are meant to be used, as registerAudioFocusListener and unregisterAudioFocusListener provided no additional functionality over the request/abandon methods. abandonAudioFocus() also removes the listener from the map in AudioManager since after abandonning focus, the listener would no longer be called." into froyo
|
2010-05-11 09:42:41 -07:00 |
|
Keith Ito
|
735da3103b
|
Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
|
2010-05-10 20:41:47 -07:00 |
|
Costin Manolache
|
7395cf239b
|
Bug 2673557: rename datamessaging
Change-Id: I583ac61c7b8fce69d60801dc76aeca9f13d250b2
|
2010-05-10 19:12:49 -07:00 |
|
Dianne Hackborn
|
ff91f88305
|
Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo
|
2010-05-10 17:27:14 -07:00 |
|
Dirk Dougherty
|
d48af30682
|
Merge "Doc change: Final api diffs 7 -> 8." into froyo
|
2010-05-10 16:23:13 -07:00 |
|
Jim Miller
|
dbcc5242bc
|
Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
|
2010-05-10 15:55:41 -07:00 |
|
Robert Greenwalt
|
49503107e9
|
Merge "String change to refer to wifi tether as hotspot" into froyo
|
2010-05-10 10:11:12 -07:00 |
|