OSDN Git Service
Eric Rowe [Thu, 5 Aug 2010 21:49:22 +0000 (14:49 -0700)]
Merge "Checkin initial bluetooth stress tests." into froyo
Scott Main [Mon, 2 Aug 2010 16:16:30 +0000 (09:16 -0700)]
Merge "Doc change: Add nexus one to dev phones." into froyo
Andreas Huber [Fri, 30 Jul 2010 15:05:56 +0000 (08:05 -0700)]
Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo
The Android Open Source Project [Fri, 30 Jul 2010 00:45:56 +0000 (17:45 -0700)]
Merge branch 'froyo' of git://android.git./platform/frameworks/base into HEAD
Jean-Baptiste Queru [Fri, 30 Jul 2010 00:35:37 +0000 (17:35 -0700)]
fix inaccurate copyrights
Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
Gilles Debunne [Fri, 30 Jul 2010 00:39:32 +0000 (17:39 -0700)]
Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo
Gilles Debunne [Fri, 30 Jul 2010 00:39:18 +0000 (17:39 -0700)]
Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo
The Android Open Source Project [Thu, 29 Jul 2010 22:38:41 +0000 (15:38 -0700)]
Merge from open-source froyo
Change-Id: Ifa75fce9bd362b06ecb622219ef501e61e89fd76
Scott Main [Wed, 28 Jul 2010 21:20:18 +0000 (14:20 -0700)]
Merge "fix markup error bug:
2871538" into froyo
Brad Fitzpatrick [Tue, 27 Jul 2010 23:44:53 +0000 (16:44 -0700)]
Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo
Joe Onorato [Tue, 27 Jul 2010 16:05:05 +0000 (09:05 -0700)]
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
Dan Egnor [Wed, 21 Jul 2010 20:53:23 +0000 (13:53 -0700)]
Merge "Avoid leaking file descriptors when returning drop box events." into froyo
Dan Egnor [Tue, 20 Jul 2010 20:57:08 +0000 (13:57 -0700)]
Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo
Dan Egnor [Tue, 20 Jul 2010 01:14:50 +0000 (18:14 -0700)]
Merge "COMMENT-ONLY change to clarify Camera documentation." into froyo
Scott Main [Mon, 19 Jul 2010 21:42:13 +0000 (14:42 -0700)]
Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo
Hung Dang [Fri, 16 Jul 2010 22:13:12 +0000 (15:13 -0700)]
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
Scott Main [Fri, 16 Jul 2010 21:52:03 +0000 (14:52 -0700)]
Merge "docs: editorial revisions to Search guide" into froyo
Scott Main [Fri, 16 Jul 2010 01:14:16 +0000 (18:14 -0700)]
Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
Katie McCormick [Fri, 16 Jul 2010 00:25:10 +0000 (17:25 -0700)]
Merge "Doc change: Update AVD create instructions." into froyo
Scott Main [Thu, 15 Jul 2010 18:16:32 +0000 (11:16 -0700)]
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
Andrew Stadler [Thu, 15 Jul 2010 05:26:56 +0000 (22:26 -0700)]
Merge "Skip hostname verification when using insecure factory" into froyo
Dianne Hackborn [Tue, 13 Jul 2010 02:03:26 +0000 (19:03 -0700)]
Merge "Fix issue #
2834005: Android Settings.Secure bypass" into froyo
Scott Main [Thu, 8 Jul 2010 01:37:48 +0000 (18:37 -0700)]
Merge "docs: add caution about adt in eclipse 3.6" into froyo
Dirk Dougherty [Wed, 7 Jul 2010 21:29:29 +0000 (14:29 -0700)]
Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo
Chih-Chung Chang [Fri, 2 Jul 2010 14:43:31 +0000 (07:43 -0700)]
Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo
Scott Main [Fri, 2 Jul 2010 06:26:58 +0000 (23:26 -0700)]
Merge "docs: update device dashboard; add historical chart" into froyo
Chih-Chung Chang [Thu, 1 Jul 2010 13:06:45 +0000 (21:06 +0800)]
Flush binder buffer after setting raw heap to avoid leaking a reference.
The problem was:
1. In handleShutter(), thread A in CameraService calls
registerBuffers(IMemoryHeap) and it's received by thread B
in system_server. [transaction 1]
2. While thread A is waiting for the reply, thread B calls
back to thread A to get the id of the heap
(IMemoryHeap.getHeapID). [transaction 2]
3. Thread A replies transaction 2 and is preemptied in kernel.
Thread B gets the reply and finishes registerBuffers and send
reply for transaction 1.
4. When thread A runs again, it gets the reply for transaction 1
and returns to handleShutter().
5. At this point the transaction buffer for transaction 2 (which
holds a reference to IMemoryHeap) is not freed because the
BC_FREE_BUFFER command is kept in thread A's local command
queue and not sent to the kernel.
6. Normally when thread A makes next transaction, the
BC_FREE_BUFFER command will be sent together (piggyback) with
the commands for that transaction. But in this case thread A
is a callback thread from camera driver, so it does not make
any binder calls afterwards, and the IMemoryHeap is never freed
(until the next time handleShutter is called).
Change-Id: I435a258187509bdbbaf353339eb9ea577610cbd2
Doug Zongker [Wed, 30 Jun 2010 18:12:19 +0000 (11:12 -0700)]
Merge "Verify hostname where possible, and clarify where not." into froyo
Scott Main [Fri, 25 Jun 2010 01:10:41 +0000 (18:10 -0700)]
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
Dianne Hackborn [Thu, 24 Jun 2010 23:00:06 +0000 (16:00 -0700)]
Merge "Properly note the current active restore set's token" into froyo
Nick Pelly [Thu, 24 Jun 2010 18:52:39 +0000 (11:52 -0700)]
Merge "Do not log AT command traffic by default." into froyo
Scott Main [Wed, 23 Jun 2010 16:57:46 +0000 (09:57 -0700)]
Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
Dirk Dougherty [Tue, 22 Jun 2010 18:13:48 +0000 (11:13 -0700)]
Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
James Dong [Wed, 16 Jun 2010 23:10:52 +0000 (16:10 -0700)]
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
Dave Sparks [Wed, 16 Jun 2010 21:11:40 +0000 (14:11 -0700)]
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
Scott Main [Wed, 16 Jun 2010 02:33:03 +0000 (19:33 -0700)]
Merge "docs: update dashboard" into froyo
Ying Wang [Tue, 15 Jun 2010 20:45:08 +0000 (13:45 -0700)]
Move android-common to framework/ex
This is one necessary step by unbundling.
Change-Id: I9d922a52374ad6331fa2e39fa4b5e16ad7d108fa
Joe Onorato [Tue, 15 Jun 2010 20:59:10 +0000 (13:59 -0700)]
Merge "Use the droidcore goal with dist-for-goals." into froyo
Joe Onorato [Tue, 15 Jun 2010 20:58:33 +0000 (13:58 -0700)]
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
Scott Main [Tue, 15 Jun 2010 17:36:27 +0000 (10:36 -0700)]
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
Scott Main [Tue, 15 Jun 2010 17:36:14 +0000 (10:36 -0700)]
Merge "docs: fix markup error" into froyo
Dirk Dougherty [Fri, 11 Jun 2010 23:49:14 +0000 (16:49 -0700)]
Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Irfan Sheriff [Fri, 11 Jun 2010 01:56:04 +0000 (18:56 -0700)]
Merge "Remove indefinite DHCP retries" into froyo
Joe Onorato [Thu, 10 Jun 2010 02:06:02 +0000 (19:06 -0700)]
Use the droidcore goal with dist-for-goals.
Change-Id: Ie0042028c4a33a23a4eb9aed1d1015e580c3e168
Mike Lockwood [Thu, 10 Jun 2010 22:28:31 +0000 (15:28 -0700)]
Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo
Adam Powell [Thu, 10 Jun 2010 21:09:50 +0000 (14:09 -0700)]
Merge "Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
Jim Miller [Tue, 8 Jun 2010 23:31:32 +0000 (16:31 -0700)]
Merge "Fix
2737842: Disable KeguardManager API if device policy is enabled" into froyo
Romain Guy [Tue, 8 Jun 2010 19:59:36 +0000 (12:59 -0700)]
Merge "Add a method to hide/show a SurfaceView's surface." into froyo
Jim Miller [Tue, 8 Jun 2010 02:24:45 +0000 (19:24 -0700)]
Merge "Fix
2737842: disable keyguard API when device policy is enabled." into froyo
Christopher Tate [Tue, 8 Jun 2010 01:46:46 +0000 (18:46 -0700)]
Merge "Don't bring up Launcher until after boot complete" into froyo
Dianne Hackborn [Tue, 8 Jun 2010 00:32:02 +0000 (17:32 -0700)]
Merge "Fix issue #
2749322: addPackageToPreferred throws SecurityException" into froyo
Christopher Tate [Sat, 5 Jun 2010 01:06:07 +0000 (18:06 -0700)]
Merge "Watchdog now records kernel stacks when it fires" into froyo
Dianne Hackborn [Fri, 4 Jun 2010 23:32:01 +0000 (16:32 -0700)]
Merge "xhdpi" into froyo
Robert Greenwalt [Fri, 4 Jun 2010 22:55:09 +0000 (15:55 -0700)]
Merge "Make the DUN apn data secure." into froyo
Andreas Huber [Thu, 3 Jun 2010 22:28:13 +0000 (15:28 -0700)]
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
Dirk Dougherty [Thu, 3 Jun 2010 19:57:06 +0000 (12:57 -0700)]
Merge "Doc change: Adjust security sandbox description." into froyo
James Dong [Thu, 3 Jun 2010 18:26:09 +0000 (11:26 -0700)]
Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
Scott Main [Wed, 2 Jun 2010 20:43:18 +0000 (13:43 -0700)]
Merge "docs: a couple doc bug fixes" into froyo
Dirk Dougherty [Tue, 1 Jun 2010 22:44:02 +0000 (15:44 -0700)]
Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
Dan Egnor [Tue, 1 Jun 2010 21:09:20 +0000 (14:09 -0700)]
Merge "Comment-only change to add documentation for FileObserver" into froyo
Dirk Dougherty [Tue, 1 Jun 2010 18:04:20 +0000 (11:04 -0700)]
Merge "Doc change: updated dashboards stats." into froyo
Kenny Root [Thu, 27 May 2010 19:04:34 +0000 (12:04 -0700)]
Merge "Fix typo in EastAsianWidth javadoc" into froyo
Dirk Dougherty [Thu, 27 May 2010 18:46:26 +0000 (11:46 -0700)]
Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
Jeff Hamilton [Thu, 27 May 2010 16:39:19 +0000 (09:39 -0700)]
Merge "Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
Irfan Sheriff [Thu, 27 May 2010 04:32:29 +0000 (21:32 -0700)]
Merge "Fix null pointer exception" into froyo
Dirk Dougherty [Thu, 27 May 2010 01:31:38 +0000 (18:31 -0700)]
Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
Dirk Dougherty [Wed, 26 May 2010 23:49:46 +0000 (16:49 -0700)]
Merge "Doc change: fix adt download page, misc doc fixes." into froyo
Irfan Sheriff [Wed, 26 May 2010 20:02:06 +0000 (13:02 -0700)]
Merge "Fix escaping of characters" into froyo
Yu Shan Emily Lau [Wed, 26 May 2010 00:40:51 +0000 (17:40 -0700)]
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
Andreas Huber [Thu, 20 May 2010 18:11:39 +0000 (11:11 -0700)]
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
Scott Main [Thu, 20 May 2010 03:24:18 +0000 (20:24 -0700)]
Merge "docs: add youtube video to highlights" into froyo
Scott Main [Thu, 20 May 2010 02:29:19 +0000 (19:29 -0700)]
Merge "doc: add developing and testing info to backup guide" into froyo
Scott Main [Wed, 19 May 2010 19:05:52 +0000 (12:05 -0700)]
Merge "docs: revise platform intro" into froyo
Suchi Amalapurapu [Tue, 18 May 2010 21:51:55 +0000 (14:51 -0700)]
Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
Jaikumar Ganesh [Tue, 18 May 2010 21:48:05 +0000 (14:48 -0700)]
Merge "Removing STOPSHIP logs." into froyo
Scott Main [Tue, 18 May 2010 15:59:03 +0000 (08:59 -0700)]
Merge "docs: fix markup error" into froyo
Scott Main [Tue, 18 May 2010 00:59:37 +0000 (17:59 -0700)]
Merge "docs: revise webview description and add info for targeting screen densities" into froyo
Chung-yih Wang [Sat, 15 May 2010 06:15:04 +0000 (23:15 -0700)]
Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo
Dirk Dougherty [Fri, 14 May 2010 20:58:12 +0000 (13:58 -0700)]
Merge "Doc change: adjust compatibility doc." into froyo
Dirk Dougherty [Fri, 14 May 2010 20:46:42 +0000 (13:46 -0700)]
Merge "Doc change: adjustments to the api changes description" into froyo
Dirk Dougherty [Fri, 14 May 2010 20:43:19 +0000 (13:43 -0700)]
Merge "Doc change: add note about future instruction set support." into froyo
Dirk Dougherty [Fri, 14 May 2010 20:38:20 +0000 (13:38 -0700)]
Merge "Doc change: documentation for library projects in sdk." into froyo
Dirk Dougherty [Fri, 14 May 2010 04:31:10 +0000 (21:31 -0700)]
Merge "Doc change: adjustments for ndk feature description" into froyo
Suchi Amalapurapu [Thu, 13 May 2010 23:02:20 +0000 (16:02 -0700)]
Merge "Fix
2672155 Check the code path when enabling disabling packages." into froyo
Costin Manolache [Thu, 13 May 2010 02:04:27 +0000 (19:04 -0700)]
Merge "Bug
2680071: Rename the Cloud to Device" into froyo
Costin Manolache [Wed, 12 May 2010 23:04:10 +0000 (16:04 -0700)]
Bug
2680071: Rename the Cloud to Device
Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
Scott Main [Wed, 12 May 2010 22:01:30 +0000 (15:01 -0700)]
Merge "docs: add missing path-permissions document" into froyo
Scott Main [Wed, 12 May 2010 21:53:35 +0000 (14:53 -0700)]
Merge "docs: fix broken links" into froyo
Dirk Dougherty [Wed, 12 May 2010 18:05:03 +0000 (11:05 -0700)]
Merge "Doc change: remove Google I/O 09 from carousel." into froyo
Scott Main [Wed, 12 May 2010 03:13:26 +0000 (20:13 -0700)]
Merge "docs: fix broken anchor names" into froyo
Dirk Dougherty [Wed, 12 May 2010 02:53:04 +0000 (19:53 -0700)]
Merge "Doc change: update diff report 7-> 8" into froyo
Scott Main [Wed, 12 May 2010 02:25:19 +0000 (19:25 -0700)]
Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo
Brett Chabot [Wed, 12 May 2010 02:17:04 +0000 (19:17 -0700)]
Merge "Fix imf tests." into froyo
Scott Main [Tue, 11 May 2010 22:25:38 +0000 (15:25 -0700)]
Merge "docs: remove allowBackup attribute from documentation" into froyo
Xavier Ducrohet [Tue, 11 May 2010 21:48:48 +0000 (14:48 -0700)]
Merge "Hide two audio focus methods." into froyo
Marco Nelissen [Tue, 11 May 2010 21:36:16 +0000 (14:36 -0700)]
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
Dianne Hackborn [Tue, 11 May 2010 21:26:43 +0000 (14:26 -0700)]
Merge "Fix issue #
2676378: Activity Manager Crash on FRF40" into froyo
Dirk Dougherty [Tue, 11 May 2010 21:20:24 +0000 (14:20 -0700)]
Merge "Doc Change: Docs for NDK r4." into froyo
Scott Main [Tue, 11 May 2010 21:04:49 +0000 (14:04 -0700)]
Merge "docs: announce froyo and update IO message" into froyo
Mike Lockwood [Tue, 11 May 2010 20:26:25 +0000 (13:26 -0700)]
Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo