- b5a0d4b Merge from open-source froyo by The Android Open Source Project · 15 years ago
- 9c990d4 Merge "fix markup error bug:2871538" into froyo by Scott Main · 15 years ago
- be2ec77 Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo by Brad Fitzpatrick · 15 years ago
- 38723b0 Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." into froyo by Joe Onorato · 15 years ago
- e39c274 Merge "Avoid leaking file descriptors when returning drop box events." into froyo by Dan Egnor · 15 years ago
- 468c4f6 Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo by Dan Egnor · 15 years ago
- 351778f Merge "COMMENT-ONLY change to clarify Camera documentation." into froyo by Dan Egnor · 15 years ago
- 7125c10 Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo by Scott Main · 15 years ago
- fb9b248 Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo by Hung Dang · 16 years ago
- f044328 Merge "docs: editorial revisions to Search guide" into froyo by Scott Main · 16 years ago
- 9457041 Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo by Scott Main · 16 years ago
- 9db8431 Merge "Doc change: Update AVD create instructions." into froyo by Katie McCormick · 16 years ago
- a4e25ab Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo by Scott Main · 16 years ago
- 2658215 Merge "Skip hostname verification when using insecure factory" into froyo by Andrew Stadler · 16 years ago
- 85001bc Merge "Fix issue #2834005: Android Settings.Secure bypass" into froyo by Dianne Hackborn · 16 years ago
- 4c655a2 Merge "docs: add caution about adt in eclipse 3.6" into froyo by Scott Main · 16 years ago
- 90dc86d Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo by Dirk Dougherty · 16 years ago
- 4e459e7 Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo by Chih-Chung Chang · 16 years ago
- 60a1589 Merge "docs: update device dashboard; add historical chart" into froyo by Scott Main · 16 years ago
- b6aef25 Flush binder buffer after setting raw heap to avoid leaking a reference. by Chih-Chung Chang · 16 years ago
- a71f3af Merge "Verify hostname where possible, and clarify where not." into froyo by Doug Zongker · 16 years ago
- 29d8e66 Merge "docs: Remove the TOS from download flow and remove TOS entirely because it's no longer relevant to the SDK download package" into froyo by Scott Main · 16 years ago
- 2f90b21 Merge "Properly note the current active restore set's token" into froyo by Dianne Hackborn · 16 years ago
- 7ed4deb Merge "Do not log AT command traffic by default." into froyo by Nick Pelly · 16 years ago
- 0d168d3 Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo by Scott Main · 16 years ago
- 0f63401 Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo by Dirk Dougherty · 16 years ago
- 748ad2b Merge "When filling the cache, we always time out waiting for a condition that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo by James Dong · 16 years ago
- e9a36f1 Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into froyo by Dave Sparks · 16 years ago
- b7310b2 Merge "docs: update dashboard" into froyo by Scott Main · 16 years ago
- 98294e5 Move android-common to framework/ex by Ying Wang · 16 years ago
- d103af4 Merge "Use the droidcore goal with dist-for-goals." into froyo by Joe Onorato · 16 years ago
- fa5f5bc Merge "The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them." into froyo by Joe Onorato · 16 years ago
- 10d3c34 Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo by Scott Main · 16 years ago
- 3dde370 Merge "docs: fix markup error" into froyo by Scott Main · 16 years ago
- 6c62242 Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo by Dirk Dougherty · 16 years ago
- c17564d Merge "Remove indefinite DHCP retries" into froyo by Irfan Sheriff · 16 years ago
- 977a647 Use the droidcore goal with dist-for-goals. by Joe Onorato · 16 years ago
- 68c92f3 Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo by Mike Lockwood · 16 years ago
- a9d5632 Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo by Adam Powell · 16 years ago
- 5ca447a Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo by Jim Miller · 16 years ago
- 649329c Merge "Add a method to hide/show a SurfaceView's surface." into froyo by Romain Guy · 16 years ago
- c354b89 Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo by Jim Miller · 16 years ago
- e185584 Merge "Don't bring up Launcher until after boot complete" into froyo by Christopher Tate · 16 years ago
- 73f8edb Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo by Dianne Hackborn · 16 years ago
- 7188d68 Merge "Watchdog now records kernel stacks when it fires" into froyo by Christopher Tate · 16 years ago
- 28b9f6e Merge "xhdpi" into froyo by Dianne Hackborn · 16 years ago
- 0f3ca0f Merge "Make the DUN apn data secure." into froyo by Robert Greenwalt · 16 years ago
- da26806 Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo by Andreas Huber · 16 years ago
- c253940 Merge "Doc change: Adjust security sandbox description." into froyo by Dirk Dougherty · 16 years ago
- c1cf270 Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo by James Dong · 16 years ago
- e66d578 Merge "docs: a couple doc bug fixes" into froyo by Scott Main · 16 years ago
- 4005afd Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo by Dirk Dougherty · 16 years ago
- f192ba7 Merge "Comment-only change to add documentation for FileObserver" into froyo by Dan Egnor · 16 years ago
- 2a053dc Merge "Doc change: updated dashboards stats." into froyo by Dirk Dougherty · 16 years ago
- 2baa0fb Merge "Fix typo in EastAsianWidth javadoc" into froyo by Kenny Root · 16 years ago
- f007f06 Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo by Dirk Dougherty · 16 years ago
- 5b4069e Merge "Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo by Jeff Hamilton · 16 years ago
- cde6827 Merge "Fix null pointer exception" into froyo by Irfan Sheriff · 16 years ago
- 6667c79 Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo by Dirk Dougherty · 16 years ago
- 60f35bb Merge "Doc change: fix adt download page, misc doc fixes." into froyo by Dirk Dougherty · 16 years ago
- d50f839 Merge "Fix escaping of characters" into froyo by Irfan Sheriff · 16 years ago
- d5fa4a9 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 by Yu Shan Emily Lau · 16 years ago
- 5fed07a 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 by Andreas Huber · 16 years ago
- 98ca2ec Merge "docs: add youtube video to highlights" into froyo by Scott Main · 16 years ago
- ee85a0a Merge "doc: add developing and testing info to backup guide" into froyo by Scott Main · 16 years ago
- 0c113f6 Merge "docs: revise platform intro" into froyo by Scott Main · 16 years ago
- 4f7c935 Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo by Suchi Amalapurapu · 16 years ago
- c6c11bd Merge "Removing STOPSHIP logs." into froyo by Jaikumar Ganesh · 16 years ago
- 8608054 Merge "docs: fix markup error" into froyo by Scott Main · 16 years ago
- 0c9d643 Merge "docs: revise webview description and add info for targeting screen densities" into froyo by Scott Main · 16 years ago
- 41613ed Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo by Chung-yih Wang · 16 years ago
- 9b0f549 Merge "Doc change: adjust compatibility doc." into froyo by Dirk Dougherty · 16 years ago
- 2363a9d Merge "Doc change: adjustments to the api changes description" into froyo by Dirk Dougherty · 16 years ago
- c04d390 Merge "Doc change: add note about future instruction set support." into froyo by Dirk Dougherty · 16 years ago
- a3f10c5 Merge "Doc change: documentation for library projects in sdk." into froyo by Dirk Dougherty · 16 years ago
- 32374ef Merge "Doc change: adjustments for ndk feature description" into froyo by Dirk Dougherty · 16 years ago
- 60ef6d7 Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo by Suchi Amalapurapu · 16 years ago
- c7e64a8 Merge "Bug 2680071: Rename the Cloud to Device" into froyo by Costin Manolache · 16 years ago
- b4490ff Bug 2680071: Rename the Cloud to Device by Costin Manolache · 16 years ago
- 7a789c8 Merge "docs: add missing path-permissions document" into froyo by Scott Main · 16 years ago
- 003f8c3 Merge "docs: fix broken links" into froyo by Scott Main · 16 years ago
- 5d8d9f1 Merge "Doc change: remove Google I/O 09 from carousel." into froyo by Dirk Dougherty · 16 years ago
- 5f50306 Merge "docs: fix broken anchor names" into froyo by Scott Main · 16 years ago
- c42a5b0 Merge "Doc change: update diff report 7-> 8" into froyo by Dirk Dougherty · 16 years ago
- 2a2c699 Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo by Scott Main · 16 years ago
- b7c34d1 Merge "Fix imf tests." into froyo by Brett Chabot · 16 years ago
- 6ff074c Merge "docs: remove allowBackup attribute from documentation" into froyo by Scott Main · 16 years ago
- 4ef3c6a Merge "Hide two audio focus methods." into froyo by Xavier Ducrohet · 16 years ago
- ac1feed 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 by Marco Nelissen · 16 years ago
- cd4d3b6 Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo by Dianne Hackborn · 16 years ago
- 0feef91 Merge "Doc Change: Docs for NDK r4." into froyo by Dirk Dougherty · 16 years ago
- 2577b83 Merge "docs: announce froyo and update IO message" into froyo by Scott Main · 16 years ago
- c9797fe Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo by Mike Lockwood · 16 years ago
- c5417a7 Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo by Andreas Huber · 16 years ago
- 1722e37 Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo by Andreas Huber · 16 years ago
- 8e254d8 Merge "Bug 2673557: rename datamessaging" into froyo by Costin Manolache · 16 years ago
- edd2838 Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo by Jean-Michel Trivi · 16 years ago
- 6f29001 Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo by Dirk Dougherty · 16 years ago
- d657af3 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 by Jean-Michel Trivi · 16 years ago
- 735da31 Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo by Keith Ito · 16 years ago