ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
12,142 Commits 2 Branches 0 Tags 54 MiB
3196ed26d4
Commit Graph

12142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
3196ed26d4 Merge "Attempt to fix the build ... again." 2010-01-27 13:31:36 -08:00
Elliott Hughes
a2a7098578 Merge "Remove about-to-be-renamed class from preload list." 2010-01-27 13:23:45 -08:00
Andreas Huber
15c323793d Merge "Do not hold onto the master lock while reading data from the datasource. This would prevent consumers from reading cached data immediately if it is available." 2010-01-27 13:12:58 -08:00
Ken Shirriff
746457bc4a Merge "Fix ExtendedProperties EntityIterator." 2010-01-27 13:08:01 -08:00
Amith Yamasani
2fd64ca6e8 Merge "Move Search dialog out of system process into current activity." 2010-01-27 12:45:23 -08:00
Vasu Nori
78019c13dc Merge "dont use sqlite_stmt_journals dir" 2010-01-27 12:10:56 -08:00
Suchi Amalapurapu
0fc1da5319 Merge "AppsOnSd feature - Add default container" 2010-01-27 10:40:26 -08:00
Yu Shan Emily Lau
6cec95ae6c Merge "Add the new golden thumbnail image as the PV and stagefright implementations in capturing thumbnail is different." 2010-01-27 10:28:51 -08:00
Doug Zongker
881e06e230 Merge "update javadoc for Settings.Secure.ANDROID_ID" 2010-01-27 09:40:23 -08:00
Evan Millar
a87bb7e4ee Merge "b/2383073 Add fine-grained status codes for failed downloads." 2010-01-27 09:26:24 -08:00
Andreas Huber
1940799f5d Merge "Better support for HTTP streaming media content, fixes to the way HTTPDataSource streams the data, prefetcher implementation." 2010-01-27 09:24:43 -08:00
Chih-Chung Chang
556a6fed12 Merge "Add support for setting camera display orientation." 2010-01-27 09:20:19 -08:00
Wei-Ta Chen
9d3ad2b296 Merge "Add a Java API that converts yuv data to a jpeg." 2010-01-26 20:23:22 -08:00
Dan Egnor
370eb18cde Merge changes Iea11654e,I2242da5a,I66c40e73 
* changes:
  Use six dashes instead of five.
  Include more verbose device information with kernel dumps (hardware, bootloader, etc.), and separate the device info headers from the actual dump with a blank line.
  Add package information to dropbox reports for ANR, crash, etc. (Notably including package version codes, to help when we're shipping out-of-cycle unbundled app updates.)
 2010-01-26 20:05:20 -08:00
Elliott Hughes
eaec4f1010 Merge "Track removal of a class." 2010-01-26 17:46:16 -08:00
San Mehat
8e25c08f8c Merge "MountService: Don't update the storage status when we're unmounted" 2010-01-26 16:52:49 -08:00
Eugene Koh
0d6b48ead5 Merge "Modify the interface of HanziToPinyin class to make it generic and add test class" 2010-01-26 16:48:52 -08:00
Scott Main
26ae5b2f66 Merge "remove @deprecated from dropDownHeight and dropDownWidth" 2010-01-26 15:42:15 -08:00
Scott Main
24b709a8e8 Merge "remove @deprecated tag from "fill_parent" because it bubbles up and declares the entire attribute as deprecated." 2010-01-26 15:32:02 -08:00
San Mehat
bf53a28433 Merge "MountService: Explicitly query volume state on startup" 2010-01-26 14:18:47 -08:00
San Mehat
5c6ce3ec9e Merge "NativeDaemonConnector: fix doListCommand() to return *all* list elements" 2010-01-26 13:38:41 -08:00
Chris Tate
e9a0419738 Merge "Move towards a formal public API for backup and restore" 2010-01-26 12:29:13 -08:00
Mike Reed
73f85e42f2 Merge "add API to change default config on image decoders." 2010-01-26 12:20:43 -08:00
Mike Lockwood
f79bdd8298 Merge "Unhide the secure setting for LocationProviderEnabled" 2010-01-26 11:36:41 -08:00
Jason Sams
8a15a77b31 Merge "Turn the debugging back on." 2010-01-26 11:34:48 -08:00
David Turner
1b61770f37 Merge "Make PackageManager unpack gdbserver binaries at installation time." 2010-01-26 11:24:47 -08:00
Chih-Chung Chang
f091e833d3 Add support for setting camera display orientation. 2010-01-26 11:07:07 -08:00
Nicolas Roard
a02c8afed9 Merge "Fix memory leak with layers. This fix bug http://b/2394813 This is a two-parts CL (needs C++ modifs)" 2010-01-26 10:38:42 -08:00
Nick Pelly
882b90fd23 Merge "Revert "Fix failure to open AVRCP input device due to EPERM."" 2010-01-26 10:36:44 -08:00
Nick Pelly
1b5cf329ea Revert "Fix failure to open AVRCP input device due to EPERM." 
This reverts commit e6b1bbd8acca3f6e174c24cf4eb23a66db2d08a2.
 2010-01-26 10:28:52 -08:00
Patrick Scott
98a61ef592 am 5b7ea014: (-s ours) am e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2 
Merge commit '5b7ea0146dcfd5564d894d4cf0104919775feb36'

* commit '5b7ea0146dcfd5564d894d4cf0104919775feb36':
  DO NOT MERGE
 2010-01-26 10:27:12 -08:00
Grace Kloba
d77667f3b3 am c811cd91: am caf0ce3c: Delay resetting mPreventDrag flags so that the Plugin will have more time to respond whether it wants to handle the touch events. (not have to return the value from WebViewCore before the first tap is up) 
Merge commit 'c811cd916f7264f11ba4c96fcd8b88e5d58e04db'

* commit 'c811cd916f7264f11ba4c96fcd8b88e5d58e04db':
  Delay resetting mPreventDrag flags so that the Plugin
 2010-01-26 10:27:06 -08:00
Grace Kloba
f3b670aef0 am cf0957ce: am 77dc179b: As embedded and full screen shares the same view, we have to replace the AbsoluteLayout with ViewGroup.Layout before setting it to the dialog as dialog\'s FrameLayout doesn\'t accept AbsoluteLayout. 
Merge commit 'cf0957ce4b0ba45b6c66c726710a5126c6a57542'

* commit 'cf0957ce4b0ba45b6c66c726710a5126c6a57542':
  As embedded and full screen shares the same view,
 2010-01-26 10:26:57 -08:00
Patrick Scott
696f0adeef am e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2 
Merge commit 'e7b2845d685a583e8e84de369b6acfa1bebeabf4' into eclair-mr2-plus-aosp

* commit 'e7b2845d685a583e8e84de369b6acfa1bebeabf4':
  DO NOT MERGE
 2010-01-26 10:11:30 -08:00
Robert Greenwalt
fafd2adbaa resolved conflicts for merge of 1f2f23bd to master 2010-01-26 10:09:52 -08:00
Grace Kloba
e42072d30c am caf0ce3c: Delay resetting mPreventDrag flags so that the Plugin will have more time to respond whether it wants to handle the touch events. (not have to return the value from WebViewCore before the first tap is up) 
Merge commit 'caf0ce3ca2b3deba4bcff6c920740bafd87f2b62' into eclair-mr2-plus-aosp

* commit 'caf0ce3ca2b3deba4bcff6c920740bafd87f2b62':
  Delay resetting mPreventDrag flags so that the Plugin
 2010-01-26 10:09:52 -08:00
Grace Kloba
866f0ba964 am 77dc179b: As embedded and full screen shares the same view, we have to replace the AbsoluteLayout with ViewGroup.Layout before setting it to the dialog as dialog\'s FrameLayout doesn\'t accept AbsoluteLayout. 
Merge commit '77dc179baa7b8fb405633fd46324e336285d10e2' into eclair-mr2-plus-aosp

* commit '77dc179baa7b8fb405633fd46324e336285d10e2':
  As embedded and full screen shares the same view,
 2010-01-26 10:09:39 -08:00
Patrick Scott
30b2c96928 Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2 2010-01-26 10:07:23 -08:00
San Mehat
fa289ea7af Merge "NetworkManagementService: Start service when SystemServer starts up" 2010-01-26 07:59:08 -08:00
Patrick Scott
c51619f2ff Merge "Set a flag that indicates a response is pending." 2010-01-26 07:08:17 -08:00
San Mehat
f67d028db6 Merge "MountService: Add support for renaming secure containers" 2010-01-26 06:19:21 -08:00
Irfan Sheriff
5c52057ae1 resolved conflicts for merge of d0514347 to master 2010-01-25 19:10:31 -08:00
Grace Kloba
4da3d55c4b am e5b9beae: (-s ours) am f6aed0e0: Merge "DO NOT MERGE" into eclair 
Merge commit 'e5b9beae260b451cb3d60583c800b0d223ae256f'

* commit 'e5b9beae260b451cb3d60583c800b0d223ae256f':
  DO NOT MERGE
 2010-01-25 18:13:29 -08:00
Grace Kloba
1824f75c03 am 5b745762: am d5ada83c: ScaleGestureDetector needs to query the displaymetrics for the width/height on each touch down as orientation can change. 
Merge commit '5b74576218055f1c9d31d9559255e8cf504cd662'

* commit '5b74576218055f1c9d31d9559255e8cf504cd662':
  ScaleGestureDetector needs to query the displaymetrics
 2010-01-25 18:13:12 -08:00
Nick Pelly
2b2c2e3a35 am 425324e9: am e834722f: Merge "Fix failure to open AVRCP input device due to EPERM." into eclair 
Merge commit '425324e97bba75cd69bb6c81de6248529540e6fe'

* commit '425324e97bba75cd69bb6c81de6248529540e6fe':
  Fix failure to open AVRCP input device due to EPERM.
 2010-01-25 18:12:47 -08:00
Grace Kloba
80370aa83b am aeeb1a84: (-s ours) am 8681df90: DO NOT MERGE 
Merge commit 'aeeb1a84aae2c7400b2edd90cea8306565225275'

* commit 'aeeb1a84aae2c7400b2edd90cea8306565225275':
  DO NOT MERGE
 2010-01-25 18:12:31 -08:00
Mike Reed
6b2a58b1b8 am 6dc9232c: (-s ours) am a66baccc: Merge "Do not merge" into eclair 
Merge commit '6dc9232c1c9a7ddffba24d4bd218e46894f8414d'

* commit '6dc9232c1c9a7ddffba24d4bd218e46894f8414d':
  Do not merge
 2010-01-25 18:12:08 -08:00
Xavier Ducrohet
0c4fc79ed0 am 48edf7c0: am d1da5fa2: Revert "SDK doc change: Add doc update for NDKr3." 
Merge commit '48edf7c00201f2bc6186e07dbc614976642682e4'

* commit '48edf7c00201f2bc6186e07dbc614976642682e4':
  Revert "SDK doc change: Add doc update for NDKr3."
 2010-01-25 18:11:20 -08:00
Grace Kloba
ee96d5fd87 am f8c7d06f: am 89e3c1ab: Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair 
Merge commit 'f8c7d06ffa67015516b822a992513ab86aad1ad5'

* commit 'f8c7d06ffa67015516b822a992513ab86aad1ad5':
  Fix the sloppy detection in the ScaleGestureDetector.
 2010-01-25 18:11:02 -08:00
Xavier Ducrohet
629a8695aa am a0ecd4fb: am 38f7a02a: Merge "SDK doc change: Add doc update for NDKr3." into eclair 
Merge commit 'a0ecd4fbe65ffb00afb3043584a3d08ee41b0870'

* commit 'a0ecd4fbe65ffb00afb3043584a3d08ee41b0870':
  SDK doc change: Add doc update for NDKr3.
 2010-01-25 18:10:42 -08:00