The Android Open Source Project
7b8a2361ce
Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into HEAD
2010-07-29 17:45:56 -07:00
Jean-Baptiste Queru
d80c3e2f3c
fix inaccurate copyrights
...
Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
2010-07-29 17:41:35 -07:00
Gilles Debunne
81213d6a60
Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo
2010-07-29 17:39:32 -07:00
Gilles Debunne
e2ca0e83c9
Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo
2010-07-29 17:39:18 -07:00
The Android Open Source Project
b5a0d4b2df
Merge from open-source froyo
...
Change-Id: Ifa75fce9bd362b06ecb622219ef501e61e89fd76
2010-07-29 15:38:49 -07:00
Scott Main
9c990d4d8a
Merge "fix markup error bug:2871538" into froyo
2010-07-28 14:20:18 -07:00
Brad Fitzpatrick
be2ec77f92
Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo
2010-07-27 16:44:53 -07:00
Joe Onorato
38723b069c
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
2010-07-27 09:05:05 -07:00
Dan Egnor
e39c274841
Merge "Avoid leaking file descriptors when returning drop box events." into froyo
2010-07-21 13:53:23 -07:00
Dan Egnor
468c4f6de9
Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo
2010-07-20 13:57:08 -07:00
Dan Egnor
351778fa02
Merge "COMMENT-ONLY change to clarify Camera documentation." into froyo
2010-07-19 18:14:50 -07:00
Scott Main
7125c105c4
Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo
2010-07-19 14:42:13 -07:00
Hung Dang
fb9b2483c9
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
2010-07-16 15:13:12 -07:00
Scott Main
f044328d09
Merge "docs: editorial revisions to Search guide" into froyo
2010-07-16 14:52:03 -07:00
Scott Main
9457041ee6
Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
2010-07-15 18:14:16 -07:00
Katie McCormick
9db8431e87
Merge "Doc change: Update AVD create instructions." into froyo
2010-07-15 17:25:10 -07:00
Scott Main
a4e25ab1f3
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
2010-07-15 11:16:32 -07:00
Andrew Stadler
26582158a4
Merge "Skip hostname verification when using insecure factory" into froyo
2010-07-14 22:26:56 -07:00
Dianne Hackborn
85001bc578
Merge "Fix issue #2834005 : Android Settings.Secure bypass" into froyo
2010-07-12 19:03:26 -07:00
Scott Main
4c655a2689
Merge "docs: add caution about adt in eclipse 3.6" into froyo
2010-07-07 18:37:48 -07:00
Dirk Dougherty
90dc86d7e0
Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo
2010-07-07 14:29:29 -07:00
Chih-Chung Chang
4e459e7676
Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo
2010-07-02 07:43:31 -07:00
Scott Main
60a1589654
Merge "docs: update device dashboard; add historical chart" into froyo
2010-07-01 23:26:58 -07:00
Chih-Chung Chang
b6aef253f4
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
2010-07-02 12:56:54 +08:00
Doug Zongker
a71f3aff40
Merge "Verify hostname where possible, and clarify where not." into froyo
2010-06-30 11:12:19 -07:00
Scott Main
29d8e66ce0
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
2010-06-24 18:10:41 -07:00
Dianne Hackborn
2f90b21533
Merge "Properly note the current active restore set's token" into froyo
2010-06-24 16:00:06 -07:00
Nick Pelly
7ed4deb035
Merge "Do not log AT command traffic by default." into froyo
2010-06-24 11:52:39 -07:00
Scott Main
0d168d31d4
Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
2010-06-23 09:57:46 -07:00
Dirk Dougherty
0f63401fb8
Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
2010-06-22 11:13:48 -07:00
James Dong
748ad2b542
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
2010-06-16 16:10:52 -07:00
Dave Sparks
e9a36f1e11
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
2010-06-16 14:11:40 -07:00
Scott Main
b7310b28e2
Merge "docs: update dashboard" into froyo
2010-06-15 19:33:03 -07:00
Ying Wang
98294e50d7
Move android-common to framework/ex
...
This is one necessary step by unbundling.
Change-Id: I9d922a52374ad6331fa2e39fa4b5e16ad7d108fa
2010-06-15 15:28:42 -07:00
Joe Onorato
d103af4f4e
Merge "Use the droidcore goal with dist-for-goals." into froyo
2010-06-15 13:59:10 -07:00
Joe Onorato
fa5f5bc4a6
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
2010-06-15 13:58:33 -07:00
Scott Main
10d3c342b0
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
2010-06-15 10:36:27 -07:00
Scott Main
3dde3706fa
Merge "docs: fix markup error" into froyo
2010-06-15 10:36:14 -07:00
Dirk Dougherty
6c622422b6
Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
2010-06-11 16:49:14 -07:00
Irfan Sheriff
c17564db5a
Merge "Remove indefinite DHCP retries" into froyo
2010-06-10 18:56:04 -07:00
Joe Onorato
977a647e81
Use the droidcore goal with dist-for-goals.
...
Change-Id: Ie0042028c4a33a23a4eb9aed1d1015e580c3e168
2010-06-10 18:36:58 -07:00
Mike Lockwood
68c92f3410
Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo
2010-06-10 15:28:31 -07:00
Adam Powell
a9d563290e
Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
2010-06-10 14:09:50 -07:00
Jim Miller
5ca447aa0c
Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo
2010-06-08 16:31:32 -07:00
Romain Guy
649329c3da
Merge "Add a method to hide/show a SurfaceView's surface." into froyo
2010-06-08 12:59:36 -07:00
Jim Miller
c354b89c76
Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo
2010-06-07 19:24:45 -07:00
Christopher Tate
e1855846a4
Merge "Don't bring up Launcher until after boot complete" into froyo
2010-06-07 18:46:46 -07:00
Dianne Hackborn
73f8edb0d6
Merge "Fix issue #2749322 : addPackageToPreferred throws SecurityException" into froyo
2010-06-07 17:32:02 -07:00
Christopher Tate
7188d6887e
Merge "Watchdog now records kernel stacks when it fires" into froyo
2010-06-04 18:06:07 -07:00
Dianne Hackborn
28b9f6e900
Merge "xhdpi" into froyo
2010-06-04 16:32:01 -07:00