OSDN Git Service
The Android Open Source Project [Tue, 20 Jul 2010 17:33:38 +0000 (10:33 -0700)]
merge from open-source master
Change-Id: I1901177e8a4bd32a707020c581f25f21349ba571
The Android Open Source Project [Tue, 20 Jul 2010 17:25:37 +0000 (10:25 -0700)]
merge from open-source master
Change-Id: I2a8ec9d290fc1040ba53b9fe73f92b7f90dfdf16
Andreas Huber [Tue, 20 Jul 2010 16:24:53 +0000 (09:24 -0700)]
am
faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread
Merge commit '
faf1d46a60518fcc3e58c91740e673e8a3f2d3cc' into gingerbread-plus-aosp
* commit '
faf1d46a60518fcc3e58c91740e673e8a3f2d3cc':
Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
Andreas Huber [Tue, 20 Jul 2010 16:18:58 +0000 (09:18 -0700)]
Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread
Jamie Gennis [Mon, 19 Jul 2010 23:33:11 +0000 (16:33 -0700)]
am
ff7049ab: Remove some debug logging that I accidentally committed.
Merge commit '
ff7049ab2886acc73e145367118646f7741ce333' into gingerbread-plus-aosp
* commit '
ff7049ab2886acc73e145367118646f7741ce333':
Remove some debug logging that I accidentally committed.
Jamie Gennis [Mon, 19 Jul 2010 23:09:26 +0000 (16:09 -0700)]
Remove some debug logging that I accidentally committed.
Change-Id: Ib182455fad5e5b3f3f59b3ff24f59dcd7f638292
Vasu Nori [Mon, 19 Jul 2010 22:29:10 +0000 (15:29 -0700)]
am
a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread
Merge commit '
a5fe776a7933b2241858ef83f01b812c7badc231' into gingerbread-plus-aosp
* commit '
a5fe776a7933b2241858ef83f01b812c7badc231':
fix javadoc error which breaks SDK build in gingerbread
Vasu Nori [Mon, 19 Jul 2010 22:26:39 +0000 (15:26 -0700)]
Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread
The Android Open Source Project [Mon, 19 Jul 2010 22:19:44 +0000 (15:19 -0700)]
ignore from open-source master
Change-Id: Id828527be6c49886f3e40cc2dbe61a5c9c965e71
Scott Main [Mon, 19 Jul 2010 21:52:35 +0000 (14:52 -0700)]
am
945ac54d: am
85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo
Merge commit '
945ac54da56f79c8407c0111d6ded25afcc159fc' into gingerbread-plus-aosp
* commit '
945ac54da56f79c8407c0111d6ded25afcc159fc':
docs: add troubleshooting to eclipse guide about restarting adb
Scott Main [Mon, 19 Jul 2010 21:50:32 +0000 (14:50 -0700)]
am
85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo
Merge commit '
85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d' into gingerbread
* commit '
85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d':
docs: add troubleshooting to eclipse guide about restarting adb
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
Danica Chang [Mon, 19 Jul 2010 20:50:49 +0000 (13:50 -0700)]
am
f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread
Merge commit '
f23682f128151def4d83d3e2422aea36e0a00061' into gingerbread-plus-aosp
* commit '
f23682f128151def4d83d3e2422aea36e0a00061':
fixed parsing issue in BluetoothService so that it parses the UUID property correctly
Danica Chang [Mon, 19 Jul 2010 20:47:50 +0000 (13:47 -0700)]
Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread
The Android Open Source Project [Mon, 19 Jul 2010 19:49:39 +0000 (12:49 -0700)]
merge from open-source master
Change-Id: Ia37601f1c8e38a81bfc82b90a05bd3dae20dac88
The Android Open Source Project [Mon, 19 Jul 2010 19:17:53 +0000 (12:17 -0700)]
merge from open-source master
Change-Id: Iae0a5fadd57d651a614ed1c07afc949fe0637551
Romain Guy [Mon, 19 Jul 2010 17:30:16 +0000 (10:30 -0700)]
Merge "Replaced deprecated calls to setButton and setButton2"
Romain Guy [Mon, 19 Jul 2010 17:29:59 +0000 (10:29 -0700)]
Merge "Replaced deprecated setButton Methodcalls"
Xavier Ducrohet [Mon, 19 Jul 2010 17:22:59 +0000 (10:22 -0700)]
am
80e62ac6: Fix the layoutlib Paint.set(Paint) method. Do not merge.
Merge commit '
80e62ac61c297452c003919f71c4dcd7063d1b43' into gingerbread-plus-aosp
* commit '
80e62ac61c297452c003919f71c4dcd7063d1b43':
Fix the layoutlib Paint.set(Paint) method. Do not merge.
Eric Laurent [Mon, 19 Jul 2010 17:19:49 +0000 (10:19 -0700)]
am
7203272f: Merge "Fixed problems in audio effect volume control." into gingerbread
Merge commit '
7203272f35e40bf9d4b76f1b2f9b0077738df118' into gingerbread-plus-aosp
* commit '
7203272f35e40bf9d4b76f1b2f9b0077738df118':
Fixed problems in audio effect volume control.
Eric Laurent [Mon, 19 Jul 2010 17:13:27 +0000 (10:13 -0700)]
Merge "Fixed problems in audio effect volume control." into gingerbread
The Android Open Source Project [Mon, 19 Jul 2010 16:04:02 +0000 (09:04 -0700)]
merge from open-source master
Change-Id: I84a8efc2d58476c72e84170c19dc692dc180b97d
Adam Bliss [Mon, 19 Jul 2010 15:36:26 +0000 (08:36 -0700)]
am
9714d2c4: Merge "Don\'t throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread
Merge commit '
9714d2c4d2a7563ce5ffdc1726461b24e9f1e599' into gingerbread-plus-aosp
* commit '
9714d2c4d2a7563ce5ffdc1726461b24e9f1e599':
Don't throw an exception from isProviderEnabled and getLastKnownLocation
Adam Bliss [Mon, 19 Jul 2010 15:09:19 +0000 (08:09 -0700)]
Merge "Don't throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread
James Dong [Sun, 18 Jul 2010 22:03:15 +0000 (15:03 -0700)]
am
faf775e7: Fix simulator build (1st attempt)
Merge commit '
faf775e772e329e821d81ba735474df097b1e1e9' into gingerbread-plus-aosp
* commit '
faf775e772e329e821d81ba735474df097b1e1e9':
Fix simulator build (1st attempt)
Vasu Nori [Sun, 18 Jul 2010 01:35:21 +0000 (18:35 -0700)]
am
94dab9b1: fix broken api/current.xml
Merge commit '
94dab9b13590b714a7400d513f1e4655c62ddfaf' into gingerbread-plus-aosp
* commit '
94dab9b13590b714a7400d513f1e4655c62ddfaf':
fix broken api/current.xml
Vasu Nori [Sun, 18 Jul 2010 01:25:20 +0000 (18:25 -0700)]
am
5b31498b: add video/audio chat-compatibility modes to ContactsContract
Merge commit '
5b31498ba1f9874f395d80152304512fa4c0144d' into gingerbread-plus-aosp
* commit '
5b31498ba1f9874f395d80152304512fa4c0144d':
add video/audio chat-compatibility modes to ContactsContract
Eric Laurent [Sat, 17 Jul 2010 13:46:03 +0000 (06:46 -0700)]
am
2c87e9c9: First submission of audio effect library from NXP software.
Merge commit '
2c87e9c923b0362fabf8c97ff63997542394c428' into gingerbread-plus-aosp
* commit '
2c87e9c923b0362fabf8c97ff63997542394c428':
First submission of audio effect library from NXP software.
Jeff Brown [Sat, 17 Jul 2010 00:53:48 +0000 (17:53 -0700)]
am
d3616592: Fix trackball down and movement bugs.
Merge commit '
d3616592fe1b315b589766c4b74ce728fc4968f5' into gingerbread-plus-aosp
* commit '
d3616592fe1b315b589766c4b74ce728fc4968f5':
Fix trackball down and movement bugs.
Jeff Brown [Sat, 17 Jul 2010 00:21:06 +0000 (17:21 -0700)]
Fix trackball down and movement bugs.
Bug:
2823788
Change-Id: Icb0c392b58f7e735614460b5eb87439cb73ac4f2
Jeff Brown [Fri, 16 Jul 2010 23:03:07 +0000 (16:03 -0700)]
am
ace999b0: Ignore attempts to finish events on unregistered channels.
Merge commit '
ace999b096739d376d4845c0ba94599197ff8477' into gingerbread-plus-aosp
* commit '
ace999b096739d376d4845c0ba94599197ff8477':
Ignore attempts to finish events on unregistered channels.
Hung Dang [Fri, 16 Jul 2010 22:18:03 +0000 (15:18 -0700)]
am
b6761e73: am
28fe43be: 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
Merge commit '
b6761e73ce6b255cfe96bfa1fa6ac611abcfc067' into gingerbread-plus-aosp
* commit '
b6761e73ce6b255cfe96bfa1fa6ac611abcfc067':
Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
Jamie Gennis [Fri, 16 Jul 2010 22:17:59 +0000 (15:17 -0700)]
am
c8c79a65: Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread
Merge commit '
c8c79a654d4ae8e3a883854e19cc2df757f72d82' into gingerbread-plus-aosp
* commit '
c8c79a654d4ae8e3a883854e19cc2df757f72d82':
Re-use existing Surface objects when reading them from parcels.
Hung Dang [Fri, 16 Jul 2010 22:15:44 +0000 (15:15 -0700)]
am
28fe43be: 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
Merge commit '
28fe43be5c364a8f7f248a5ac05cf832a83737c2' into gingerbread
* commit '
28fe43be5c364a8f7f248a5ac05cf832a83737c2':
Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
Jamie Gennis [Fri, 16 Jul 2010 22:14:44 +0000 (15:14 -0700)]
Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread
Jeff Brown [Fri, 16 Jul 2010 22:14:35 +0000 (15:14 -0700)]
am
00ba8844: Fix individual pointer id up/down reporting.
Merge commit '
00ba884436dc8b222ad850c73c936d87bf4e84de' into gingerbread-plus-aosp
* commit '
00ba884436dc8b222ad850c73c936d87bf4e84de':
Fix individual pointer id up/down reporting.
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
Jeff Brown [Fri, 16 Jul 2010 22:01:56 +0000 (15:01 -0700)]
Fix individual pointer id up/down reporting.
Fix a minor threading bug in InputManager dump.
Change-Id: Ic2eecf7df5a8dc9f40561fcb03ebe58a2c073778
Scott Main [Fri, 16 Jul 2010 22:02:30 +0000 (15:02 -0700)]
am
e068b464: am
2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo
Merge commit '
e068b46408f3ff390b47dc78ccf10fab76883051' into gingerbread-plus-aosp
* commit '
e068b46408f3ff390b47dc78ccf10fab76883051':
docs: editorial revisions to Search guide
Scott Main [Fri, 16 Jul 2010 21:59:48 +0000 (14:59 -0700)]
am
2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo
Merge commit '
2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1' into gingerbread
* commit '
2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1':
docs: editorial revisions to Search guide
Scott Main [Fri, 16 Jul 2010 21:52:03 +0000 (14:52 -0700)]
Merge "docs: editorial revisions to Search guide" into froyo
The Android Open Source Project [Fri, 16 Jul 2010 21:01:37 +0000 (14:01 -0700)]
merge from open-source master
Change-Id: Iacd42b06fa01fa6dfd18b81f07ce4b6da922dfff
The Android Open Source Project [Fri, 16 Jul 2010 20:58:43 +0000 (13:58 -0700)]
merge from open-source master
Change-Id: I6bdeeff30be1fdb0901aec9bcdd67176c29eaf7b
The Android Open Source Project [Fri, 16 Jul 2010 20:50:12 +0000 (13:50 -0700)]
merge from open-source master
Change-Id: Ib00a02e90d5c2c0b4cc1919258b858930967198b
The Android Open Source Project [Fri, 16 Jul 2010 20:48:39 +0000 (13:48 -0700)]
merge from open-source master
Change-Id: Ic91d205e7fd6a71320d9a4498643d384397dfb00
The Android Open Source Project [Fri, 16 Jul 2010 20:47:19 +0000 (13:47 -0700)]
merge from open-source master
Change-Id: I526915e374c6a6c34503f2b289b7b76ccceccbeb
The Android Open Source Project [Fri, 16 Jul 2010 20:42:31 +0000 (13:42 -0700)]
merge from open-source master
Change-Id: I87dc9cac9d5bf8543de8273e8b0bf72ec22e2d5f
Jamie Gennis [Fri, 16 Jul 2010 00:29:15 +0000 (17:29 -0700)]
Re-use existing Surface objects when reading them from parcels.
This change adds a process-global cache of previously deserialized Surface
objects so that if a Surface object wrapping the same ISurface gets received
again the same Surface can be used. This is important because the 'tail'
pointer in the SharedBufferClient is stored only on the client side, and needs
to be the same for all the Surface objects wrapping an ISurface instance. This
solves the problem by making there only be one Surface object wrapping an
ISurface per process.
Change-Id: I4bf0b8787885c56277622fca053022d2bb638902
Jeff Brown [Fri, 16 Jul 2010 07:16:09 +0000 (00:16 -0700)]
am
eec69d29: Merge "Fix bug with phantom input windows." into gingerbread
Merge commit '
eec69d2923636b2aaa51df93bacc2b3bbb742736' into gingerbread-plus-aosp
* commit '
eec69d2923636b2aaa51df93bacc2b3bbb742736':
Fix bug with phantom input windows.
Jeff Brown [Fri, 16 Jul 2010 07:14:38 +0000 (00:14 -0700)]
Merge "Fix bug with phantom input windows." into gingerbread
Eric Laurent [Fri, 16 Jul 2010 07:12:02 +0000 (00:12 -0700)]
am
b0374a0e: Merge "Several improvements in audio effects volume control." into gingerbread
Merge commit '
b0374a0e22756d956f8ebf2b19b1139e9e5e3384' into gingerbread-plus-aosp
* commit '
b0374a0e22756d956f8ebf2b19b1139e9e5e3384':
Several improvements in audio effects volume control.
Eric Laurent [Fri, 16 Jul 2010 07:08:50 +0000 (00:08 -0700)]
Merge "Several improvements in audio effects volume control." into gingerbread
Jeff Brown [Fri, 16 Jul 2010 06:54:05 +0000 (23:54 -0700)]
Fix bug with phantom input windows.
Add dumpsys integration for the native input dispatcher.
Add some InputDevice API stubs.
Add an appendFormat helper method to String8 for printf style
string formatting mainly for debugging purposes.
Use generic ArrayList<WindowState> everywhere in WindowManagerService
to eliminate unnecessary casts all over.
Change-Id: I9d1e3bd90eb7222d10620200477f11b7bfd25e44
Kenny Root [Fri, 16 Jul 2010 05:37:06 +0000 (22:37 -0700)]
am
bd623daf: Undo IMediaContainerService changes
Merge commit '
bd623daff1f261a0e794f059d90ba5907eb5a89a' into gingerbread-plus-aosp
* commit '
bd623daff1f261a0e794f059d90ba5907eb5a89a':
Undo IMediaContainerService changes
Dianne Hackborn [Fri, 16 Jul 2010 05:24:53 +0000 (22:24 -0700)]
am
75a91389: Merge "Implement native key pre-dispatching to IMEs." into gingerbread
Merge commit '
75a91389f1938214397aaee262f4136e6bb6b094' into gingerbread-plus-aosp
* commit '
75a91389f1938214397aaee262f4136e6bb6b094':
Implement native key pre-dispatching to IMEs.
Dianne Hackborn [Fri, 16 Jul 2010 05:22:42 +0000 (22:22 -0700)]
Merge "Implement native key pre-dispatching to IMEs." into gingerbread
Dianne Hackborn [Fri, 16 Jul 2010 00:44:53 +0000 (17:44 -0700)]
Implement native key pre-dispatching to IMEs.
This significantly re-works the native key dispatching code to
allow events to be pre-dispatched to the current IME before
being processed by native code. It introduces one new public
API, which must be called after retrieving an event if the app
wishes for it to be pre-dispatched.
Currently the native code will only do pre-dispatching of
system keys, to avoid significant overhead for gaming input.
This should be improved to be smarted, filtering for only
keys that the IME is interested in. Unfortunately IMEs don't
currently provide this information. :p
Change-Id: Ic1c7aeec8b348164957f2cd88119eb5bd85c2a9f
Kenny Root [Fri, 16 Jul 2010 04:35:53 +0000 (21:35 -0700)]
am
02c8730c: Add API to call to vold for mounting OBBs
Merge commit '
02c8730c1bf19daf48bec8c6995df676a00a73b1' into gingerbread-plus-aosp
* commit '
02c8730c1bf19daf48bec8c6995df676a00a73b1':
Add API to call to vold for mounting OBBs
Jeff Brown [Fri, 16 Jul 2010 01:47:24 +0000 (18:47 -0700)]
am
c5ed5910: Add support for new input sources.
Merge commit '
c5ed5910c9ef066cec6a13bbb404ec57b1e92637' into gingerbread-plus-aosp
* commit '
c5ed5910c9ef066cec6a13bbb404ec57b1e92637':
Add support for new input sources.
Jeff Brown [Thu, 15 Jul 2010 01:48:53 +0000 (18:48 -0700)]
Add support for new input sources.
Added several new coordinate values to MotionEvents to capture
touch major/minor area, tool major/minor area and orientation.
Renamed NDK input constants per convention.
Added InputDevice class in Java which will eventually provide
useful information about available input devices.
Added APIs for manufacturing new MotionEvent objects with multiple
pointers and all necessary coordinate data.
Fixed a bug in the input dispatcher where it could get stuck with
a pointer down forever.
Fixed a bug in the WindowManager where the input window list could
end up containing stale removed windows.
Fixed a bug in the WindowManager where the input channel was being
removed only after the final animation transition had taken place
which caused spurious WINDOW DIED log messages to be printed.
Change-Id: Ie55084da319b20aad29b28a0499b8dd98bb5da68
Romain Guy [Fri, 16 Jul 2010 01:24:02 +0000 (18:24 -0700)]
Merge "Fix the problem that color drawable cache key conflicts another drawable one. The cache key of a color drawable resource may be the same as another drawable resource's value."
Christopher Tate [Fri, 16 Jul 2010 01:21:33 +0000 (18:21 -0700)]
am
d9452ecd: Merge "Fix jni registration typo" into gingerbread
Merge commit '
d9452ecd0ce6c8e0518055929ba1fd0712146405' into gingerbread-plus-aosp
* commit '
d9452ecd0ce6c8e0518055929ba1fd0712146405':
Fix jni registration typo
Scott Main [Fri, 16 Jul 2010 01:19:27 +0000 (18:19 -0700)]
am
4cb8293b: am
d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
Merge commit '
4cb8293bb3e611777cdc6c0a09410839c9dc161f' into gingerbread-plus-aosp
* commit '
4cb8293bb3e611777cdc6c0a09410839c9dc161f':
docs: update notepad tutorial to change EditNote activity title and update codelab zip
Christopher Tate [Fri, 16 Jul 2010 01:19:17 +0000 (18:19 -0700)]
Merge "Fix jni registration typo" into gingerbread
Scott Main [Fri, 16 Jul 2010 01:17:16 +0000 (18:17 -0700)]
am
d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
Merge commit '
d59f1dea1746b316e556df5b4d2080f110aabd1c' into gingerbread
* commit '
d59f1dea1746b316e556df5b4d2080f110aabd1c':
docs: update notepad tutorial to change EditNote activity title and update codelab zip
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
Scott Main [Fri, 16 Jul 2010 01:14:07 +0000 (18:14 -0700)]
am
b8f4a84a: am
80fa5c86: docs: dashboard update
Merge commit '
b8f4a84ab9b4a2241b1ac7f2e3209131a73a108e' into gingerbread-plus-aosp
* commit '
b8f4a84ab9b4a2241b1ac7f2e3209131a73a108e':
docs: dashboard update
Scott Main [Fri, 16 Jul 2010 01:10:39 +0000 (18:10 -0700)]
am
80fa5c86: docs: dashboard update
Merge commit '
80fa5c866eaf323c39bef4159a351950f0ea527a' into gingerbread
* commit '
80fa5c866eaf323c39bef4159a351950f0ea527a':
docs: dashboard update
Katie McCormick [Fri, 16 Jul 2010 00:32:04 +0000 (17:32 -0700)]
am
a6a134d4: am
28da8e5e: Merge "Doc change: Update AVD create instructions." into froyo
Merge commit '
a6a134d42df5fde04f2cc379175c756aff333cb3' into gingerbread-plus-aosp
* commit '
a6a134d42df5fde04f2cc379175c756aff333cb3':
Doc change: Update AVD create instructions.
Katie McCormick [Fri, 16 Jul 2010 00:28:57 +0000 (17:28 -0700)]
am
28da8e5e: Merge "Doc change: Update AVD create instructions." into froyo
Merge commit '
28da8e5e4aefd919064e3c33a311edf1af5a958e' into gingerbread
* commit '
28da8e5e4aefd919064e3c33a311edf1af5a958e':
Doc change: Update AVD create instructions.
Katie McCormick [Fri, 16 Jul 2010 00:25:10 +0000 (17:25 -0700)]
Merge "Doc change: Update AVD create instructions." into froyo
Brad Fitzpatrick [Thu, 15 Jul 2010 22:52:48 +0000 (15:52 -0700)]
am
703e5d3c: StrictMode: avoid an allocation in common case
Merge commit '
703e5d3c7fbeb8ca0978045db01d40318f838612' into gingerbread-plus-aosp
* commit '
703e5d3c7fbeb8ca0978045db01d40318f838612':
StrictMode: avoid an allocation in common case
Brad Fitzpatrick [Thu, 15 Jul 2010 22:47:05 +0000 (15:47 -0700)]
am
0c36c96f: Merge "StrictMode: batch drop box writes for system apps" into gingerbread
Merge commit '
0c36c96f2a5458ebd0a5a371c8d1515fcdccb002' into gingerbread-plus-aosp
* commit '
0c36c96f2a5458ebd0a5a371c8d1515fcdccb002':
StrictMode: batch drop box writes for system apps
Brad Fitzpatrick [Thu, 15 Jul 2010 22:44:46 +0000 (15:44 -0700)]
am
1772c34e: Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread
Merge commit '
1772c34e5331a6456c8a93051192d19ff873c062' into gingerbread-plus-aosp
* commit '
1772c34e5331a6456c8a93051192d19ff873c062':
StrictMode: gather and return violating stacks in Binder replies
Brad Fitzpatrick [Thu, 15 Jul 2010 22:44:41 +0000 (15:44 -0700)]
am
c4b204bd: Merge "More StrictMode work, keeping Binder & BlockGuard\'s thread-locals in-sync." into gingerbread
Merge commit '
c4b204bdc4ab974f1f96814c93d8eaa750c15122' into gingerbread-plus-aosp
* commit '
c4b204bdc4ab974f1f96814c93d8eaa750c15122':
More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.
Brad Fitzpatrick [Thu, 15 Jul 2010 22:43:03 +0000 (15:43 -0700)]
Merge "StrictMode: batch drop box writes for system apps" into gingerbread
Brad Fitzpatrick [Thu, 15 Jul 2010 22:42:41 +0000 (15:42 -0700)]
Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread
Brad Fitzpatrick [Thu, 15 Jul 2010 22:42:12 +0000 (15:42 -0700)]
Merge "More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync." into gingerbread
Christopher Tate [Thu, 15 Jul 2010 22:03:32 +0000 (15:03 -0700)]
am
2c40582a: Merge "Add native C APIs for working with the Asset Manager" into gingerbread
Merge commit '
2c40582a6c3a5781b39d0504d5aa8934982989d2' into gingerbread-plus-aosp
* commit '
2c40582a6c3a5781b39d0504d5aa8934982989d2':
Add native C APIs for working with the Asset Manager
Christopher Tate [Thu, 15 Jul 2010 22:00:14 +0000 (15:00 -0700)]
Merge "Add native C APIs for working with the Asset Manager" into gingerbread
James Dong [Thu, 15 Jul 2010 21:37:33 +0000 (14:37 -0700)]
am
42ef0c71: Initial check-in for software m4v_h263 encoder
Merge commit '
42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae' into gingerbread-plus-aosp
* commit '
42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae':
Initial check-in for software m4v_h263 encoder
Christopher Tate [Tue, 13 Jul 2010 01:21:36 +0000 (18:21 -0700)]
Add native C APIs for working with the Asset Manager
Change-Id: I493b142c4b35e5cc1a1e85283bb5dfb306a6d261
Brad Fitzpatrick [Mon, 12 Jul 2010 18:05:38 +0000 (11:05 -0700)]
StrictMode: gather and return violating stacks in Binder replies
Now, when Thread A has a strict mode policy in effect and does a
Binder call to Thread B (most likely in another process), the strict
mode policy is passed along, but with the GATHER penalty bit set which
overrides other policies and instead gathers all offending stack
traces to a threadlocal which are then written back in the Parcel's
reply header.
Change-Id: I7d4497032a0609b37b1a2a15855f5c929ba0584d
Brad Fitzpatrick [Wed, 7 Jul 2010 23:06:39 +0000 (16:06 -0700)]
More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.
Change-Id: Ia67cabcc17a73a0f15907ffea683d06bc41b90e5
Steve Howard [Thu, 15 Jul 2010 19:28:39 +0000 (12:28 -0700)]
am
d6343c26: Merge "Interface support for custom HTTP headers in DL manager" into gingerbread
Merge commit '
d6343c26b8580f61a257a3045bfa124049201116' into gingerbread-plus-aosp
* commit '
d6343c26b8580f61a257a3045bfa124049201116':
Interface support for custom HTTP headers in DL manager
Steve Howard [Thu, 15 Jul 2010 19:24:14 +0000 (12:24 -0700)]
Merge "Interface support for custom HTTP headers in DL manager" into gingerbread
Scott Main [Thu, 15 Jul 2010 18:23:08 +0000 (11:23 -0700)]
am
5352d237: am
38137d7a: 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
Merge commit '
5352d2378d2f92ebe0657e4caedb4498492fc404' into gingerbread-plus-aosp
* commit '
5352d2378d2f92ebe0657e4caedb4498492fc404':
docs: lots of additions to the resources docs
Scott Main [Thu, 15 Jul 2010 18:20:32 +0000 (11:20 -0700)]
am
38137d7a: 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
Merge commit '
38137d7a27b037611c70a9d900aa53b4c15563bf' into gingerbread
* commit '
38137d7a27b037611c70a9d900aa53b4c15563bf':
docs: lots of additions to the resources docs
James Dong [Thu, 15 Jul 2010 18:18:53 +0000 (11:18 -0700)]
am
d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread
Merge commit '
d6a85a21418338a7797bff731fa7a551f62a9e86' into gingerbread-plus-aosp
* commit '
d6a85a21418338a7797bff731fa7a551f62a9e86':
Support user-supplied timescales for authoring
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
James Dong [Thu, 15 Jul 2010 18:16:08 +0000 (11:16 -0700)]
Merge "Support user-supplied timescales for authoring" into gingerbread
Joe Onorato [Thu, 15 Jul 2010 18:12:57 +0000 (11:12 -0700)]
am
562124e8: Merge "Clean up some style in the makefiles." into gingerbread
Merge commit '
562124e84d8ae63b614b14ba257680571091ef1f' into gingerbread-plus-aosp
* commit '
562124e84d8ae63b614b14ba257680571091ef1f':
Clean up some style in the makefiles.
Joe Onorato [Thu, 15 Jul 2010 18:12:53 +0000 (11:12 -0700)]
am
3a053db2: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Merge commit '
3a053db28451858162f3dd84f18fae2f245b07f1' into gingerbread-plus-aosp
* commit '
3a053db28451858162f3dd84f18fae2f245b07f1':
The ICU data is no longer compiled directly into the shared library.
Joe Onorato [Thu, 15 Jul 2010 18:08:39 +0000 (11:08 -0700)]
Merge "Clean up some style in the makefiles." into gingerbread
Joe Onorato [Thu, 15 Jul 2010 18:08:34 +0000 (11:08 -0700)]
Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Romain Guy [Thu, 15 Jul 2010 17:49:47 +0000 (10:49 -0700)]
Merge "Added method getPreferredHttpHost"
Jeff Brown [Thu, 15 Jul 2010 17:21:18 +0000 (10:21 -0700)]
am
eb6e0df1: Don\'t build framework tests for simulator target.
Merge commit '
eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3' into gingerbread-plus-aosp
* commit '
eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3':
Don't build framework tests for simulator target.
Romain Guy [Thu, 15 Jul 2010 16:40:34 +0000 (09:40 -0700)]
Merge "Allow ListPreference summary to use entry"
Romain Guy [Thu, 15 Jul 2010 16:39:42 +0000 (09:39 -0700)]
Merge "Make HTTP Header class handle multiple cache-control fields."
Romain Guy [Thu, 15 Jul 2010 16:39:19 +0000 (09:39 -0700)]
Merge "Makes PhoneNumberUtils support international numbers after a CLIR command."