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
Robert Greenwalt
0f3ca0faea
Merge "Make the DUN apn data secure." into froyo
2010-06-04 15:55:09 -07:00
Andreas Huber
da26806e79
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
2010-06-03 15:28:13 -07:00
Dirk Dougherty
c253940208
Merge "Doc change: Adjust security sandbox description." into froyo
2010-06-03 12:57:06 -07:00
James Dong
c1cf2705d5
Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
2010-06-03 11:26:09 -07:00
Scott Main
e66d578d71
Merge "docs: a couple doc bug fixes" into froyo
2010-06-02 13:43:18 -07:00
Dirk Dougherty
4005afd071
Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
2010-06-01 15:44:02 -07:00
Dan Egnor
f192ba713b
Merge "Comment-only change to add documentation for FileObserver" into froyo
2010-06-01 14:09:20 -07:00
Dirk Dougherty
2a053dc08d
Merge "Doc change: updated dashboards stats." into froyo
2010-06-01 11:04:20 -07:00
Kenny Root
2baa0fbad3
Merge "Fix typo in EastAsianWidth javadoc" into froyo
2010-05-27 12:04:34 -07:00
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