OSDN Git Service
The Android Open Source Project [Thu, 21 Jul 2011 14:24:01 +0000 (07:24 -0700)]
Reconcile with gingerbread-mr4-release
Change-Id: I4306273ad563fc15e0d620fc420acf26171d9a4a
Narayan Kamath [Thu, 21 Jul 2011 12:12:34 +0000 (05:12 -0700)]
Merge "Fix some AudioTrack related issues."
Martijn Coenen [Thu, 21 Jul 2011 07:32:11 +0000 (00:32 -0700)]
Merge "Support for getTimeout() (API)."
Jeff Hamilton [Thu, 21 Jul 2011 04:54:15 +0000 (21:54 -0700)]
Merge "Remove the hidden My Tag APIs."
Eric Laurent [Thu, 21 Jul 2011 02:25:34 +0000 (19:25 -0700)]
Merge "AudioRecord JAVA: expose audio session Id"
Matthew Xie [Thu, 21 Jul 2011 02:08:38 +0000 (19:08 -0700)]
Merge "when disconnectHeadsetInternal, allow it when the BT is not disabled"
Xavier Ducrohet [Thu, 21 Jul 2011 01:56:52 +0000 (18:56 -0700)]
am
b3ab070e: am
3a2d1c23: am
ddb8e3b2: am
9bac0a9f: Merge "Fix to compile for windows"
* commit '
b3ab070edb17f00a4b2d0f511ca539c885b28b6f':
Fix to compile for windows
Xavier Ducrohet [Thu, 21 Jul 2011 01:55:21 +0000 (18:55 -0700)]
am
3a2d1c23: am
ddb8e3b2: am
9bac0a9f: Merge "Fix to compile for windows"
* commit '
3a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed':
Fix to compile for windows
Xavier Ducrohet [Thu, 21 Jul 2011 01:53:08 +0000 (18:53 -0700)]
am
ddb8e3b2: am
9bac0a9f: Merge "Fix to compile for windows"
* commit '
ddb8e3b24b2fe3e4371ca8c1239748f5c71910f6':
Fix to compile for windows
Mathias Agopian [Thu, 21 Jul 2011 01:52:51 +0000 (18:52 -0700)]
Merge "clean-up. get rid ofunused code and members in Surface[Control].cpp"
Mathias Agopian [Thu, 21 Jul 2011 01:52:21 +0000 (18:52 -0700)]
Merge "silence sensorservice when it's dropping events"
Xavier Ducrohet [Thu, 21 Jul 2011 01:49:46 +0000 (18:49 -0700)]
am
9bac0a9f: Merge "Fix to compile for windows"
* commit '
9bac0a9f93976ff341fc9c46b3a85be767119a88':
Fix to compile for windows
Romain Guy [Thu, 21 Jul 2011 01:47:49 +0000 (18:47 -0700)]
Merge "Convert looper traces to traceview traces"
Xavier Ducrohet [Thu, 21 Jul 2011 01:35:35 +0000 (18:35 -0700)]
Merge "Fix to compile for windows"
Dirk Dougherty [Thu, 21 Jul 2011 01:05:56 +0000 (18:05 -0700)]
Merge "Cherrypick from hcmr2: doc change: fix typo in reference to new uses-feature constant."
Jeff Brown [Thu, 21 Jul 2011 01:03:47 +0000 (18:03 -0700)]
Merge "Untangle MediaScanner error handling. Bug:
5056917"
Gilles Debunne [Thu, 21 Jul 2011 00:51:36 +0000 (17:51 -0700)]
Merge "Suggestions are dismissed by back key"
Xavier Ducrohet [Thu, 21 Jul 2011 00:49:26 +0000 (17:49 -0700)]
am
84be06e4: resolved conflicts for merge of
ea9e6d24 to honeycomb-plus-aosp
* commit '
84be06e4ce0778fbf0c1ac72f94795ef8433439b':
Added Caching for PreProcessed PNGs
Eric Laurent [Thu, 21 Jul 2011 00:45:37 +0000 (17:45 -0700)]
Merge "Audio framework: support for audio pre processing"
Xavier Ducrohet [Thu, 21 Jul 2011 00:45:11 +0000 (17:45 -0700)]
resolved conflicts for merge of
ea9e6d24 to honeycomb-plus-aosp
Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602
Jeff Brown [Thu, 21 Jul 2011 00:42:36 +0000 (17:42 -0700)]
Merge "Remove unimplemented memory pool."
Dirk Dougherty [Thu, 21 Jul 2011 00:35:28 +0000 (17:35 -0700)]
Merge "Cherrypick from honeycomb-mr2: Doc change: diff report for API level 13."
Xavier Ducrohet [Thu, 21 Jul 2011 00:18:04 +0000 (17:18 -0700)]
am
a125c937: resolved conflicts for merge of
2c311be7 to honeycomb-plus-aosp
* commit '
a125c937de06b1cc43368743592f47513eb88b76':
Add generation of dependency file for .ap_ package
Mathias Agopian [Wed, 20 Jul 2011 23:46:11 +0000 (16:46 -0700)]
clean-up. get rid ofunused code and members in Surface[Control].cpp
Change-Id: Ia7790ae28af2c2ac99eae01c2c5044ace4a490a4
Xavier Ducrohet [Wed, 20 Jul 2011 23:31:25 +0000 (16:31 -0700)]
resolved conflicts for merge of
2c311be7 to honeycomb-plus-aosp
Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe
James Dong [Wed, 20 Jul 2011 23:08:32 +0000 (16:08 -0700)]
Merge "Let the media recording framework release the Camera object when it is the owner"
Xavier Ducrohet [Wed, 20 Jul 2011 23:02:33 +0000 (16:02 -0700)]
am
b582af31: am
0bc12a0b: Merge "Added Caching for PreProcessed PNGs"
* commit '
b582af31c74a58922120fdb747c1a3b867d95e90':
Added Caching for PreProcessed PNGs
Xavier Ducrohet [Wed, 20 Jul 2011 23:00:44 +0000 (16:00 -0700)]
am
0bc12a0b: Merge "Added Caching for PreProcessed PNGs"
* commit '
0bc12a0b13719976aff95a801d88e48c64510d11':
Added Caching for PreProcessed PNGs
Xavier Ducrohet [Wed, 20 Jul 2011 22:55:32 +0000 (15:55 -0700)]
Merge "Added Caching for PreProcessed PNGs"
Xavier Ducrohet [Wed, 20 Jul 2011 22:27:39 +0000 (15:27 -0700)]
am
30824495: am
1e24ccbd: Merge "Add generation of dependency file for .ap_ package"
* commit '
3082449508a8c574d0476fdb988f98d9554637ae':
Add generation of dependency file for .ap_ package
Xavier Ducrohet [Wed, 20 Jul 2011 22:23:55 +0000 (15:23 -0700)]
am
1e24ccbd: Merge "Add generation of dependency file for .ap_ package"
* commit '
1e24ccbdd56a45c8bb5f2eba94af5aecd2d02554':
Add generation of dependency file for .ap_ package
Jeff Brown [Wed, 20 Jul 2011 22:19:50 +0000 (15:19 -0700)]
Remove unimplemented memory pool.
dlmalloc does such a great job that we don't need a pool anyways.
Change-Id: I105b28c4a5c491543959190c7c0a9de75a5b8052
Jim Miller [Wed, 20 Jul 2011 22:19:19 +0000 (15:19 -0700)]
Merge "Fix
5056699: GridLayout should maintain static indices for "gone" views."
Jesse Wilson [Wed, 20 Jul 2011 22:11:45 +0000 (15:11 -0700)]
Merge "Appease Doclava for ReferenceQueue.remove()"
Xavier Ducrohet [Wed, 20 Jul 2011 22:08:23 +0000 (15:08 -0700)]
Merge "Add generation of dependency file for .ap_ package"
Adam Powell [Wed, 20 Jul 2011 21:30:48 +0000 (14:30 -0700)]
Merge "Fix bug
5038368 - Rules for collapsing action views."
Jesse Wilson [Wed, 20 Jul 2011 20:41:57 +0000 (13:41 -0700)]
Merge "Acknowledge that the platform guarantees UTF-8 and UTF-16."
Jesse Wilson [Wed, 20 Jul 2011 20:38:24 +0000 (13:38 -0700)]
Merge "Skip byte order mark (BOM) in JsonReader"
Daniel Sandler [Wed, 20 Jul 2011 19:44:20 +0000 (12:44 -0700)]
Merge "Fix dancing download notifications on phones."
Dave Santoro [Wed, 20 Jul 2011 19:43:26 +0000 (12:43 -0700)]
Merge "Updates and fixes for the social stream API."
Costin Manolache [Wed, 20 Jul 2011 19:33:42 +0000 (12:33 -0700)]
Merge "waitWithTimeout() needs to check if the result is already available, like waitForActivity() does."
Chia-chi Yeh [Wed, 20 Jul 2011 19:28:04 +0000 (12:28 -0700)]
Merge "ConnectivityService: Implement VPN callbacks to update DNS servers."
Mike Lockwood [Wed, 20 Jul 2011 19:15:48 +0000 (12:15 -0700)]
Merge "MediaScanner: Do separate bulk inserts for different media types"
Debashish Chatterjee [Wed, 20 Jul 2011 18:54:56 +0000 (11:54 -0700)]
Merge "Removed READ_WRITE_ALL_VOICEMAILS permission from framework."
Eric Laurent [Wed, 20 Jul 2011 18:04:18 +0000 (11:04 -0700)]
Merge "Fix issue
5012047: silent mode mutes music"
Jamie Gennis [Wed, 20 Jul 2011 17:47:04 +0000 (10:47 -0700)]
Merge "MediaPlayer: add a disconnect from ANativeWindow"
Robert Greenwalt [Wed, 20 Jul 2011 17:10:24 +0000 (10:10 -0700)]
Merge "Start default connections on startup."
Alex Sakhartchouk [Wed, 20 Jul 2011 16:41:50 +0000 (09:41 -0700)]
Merge "Correctly call glviewport when surface changes."
Gilles Debunne [Wed, 20 Jul 2011 16:12:41 +0000 (09:12 -0700)]
Merge "Insertion handles fades out after being positionned"
Russell Brenner [Wed, 20 Jul 2011 15:39:28 +0000 (08:39 -0700)]
Merge "Replace DroidKufi-Regular with DroidNaskh-Regular"
Russell Brenner [Wed, 20 Jul 2011 15:39:13 +0000 (08:39 -0700)]
Merge "Replace DroidSansArabic with DroidKufi-Regular"
Andreas Huber [Wed, 20 Jul 2011 15:05:06 +0000 (08:05 -0700)]
Merge "Content found in the wild violated the MPEG4 systems specs"
Debashish Chatterjee [Wed, 20 Jul 2011 12:34:01 +0000 (05:34 -0700)]
Merge "Voicemail content provider API for api council review."
Alon Albert [Wed, 20 Jul 2011 05:06:34 +0000 (22:06 -0700)]
Merge "Add a getter for the active tag"
Irfan Sheriff [Wed, 20 Jul 2011 02:42:35 +0000 (19:42 -0700)]
Merge "Adding WifiInfo object in CONNECTED broadcast"
Adam Cohen [Wed, 20 Jul 2011 01:43:57 +0000 (18:43 -0700)]
Merge "Adding resizeMinWidth/Height to AppWidgetProviderInfo"
Dianne Hackborn [Wed, 20 Jul 2011 01:07:00 +0000 (18:07 -0700)]
Merge "Fix issue #
4999574: Disabled system app not listed in Settings after reboot"
Dianne Hackborn [Wed, 20 Jul 2011 01:06:25 +0000 (18:06 -0700)]
Merge "Fix issue #
4976176: Font size setting does not persist"
Stephen Hines [Wed, 20 Jul 2011 00:45:49 +0000 (17:45 -0700)]
Merge "Extract BC metadata using a single call."
Eric Laurent [Wed, 20 Jul 2011 00:27:24 +0000 (17:27 -0700)]
Merge "Fix issue
4499450: Unknown Ringer Mode"
Xavier Ducrohet [Wed, 20 Jul 2011 00:23:00 +0000 (17:23 -0700)]
Merge "Layoutlib: misc fix + start of AndroidBidi support."
Romain Guy [Wed, 20 Jul 2011 00:21:46 +0000 (17:21 -0700)]
Merge "Add new OpenGL test"
Romain Guy [Wed, 20 Jul 2011 00:20:35 +0000 (17:20 -0700)]
Add new OpenGL test
Change-Id: Icab48d71945bf94dd53f58b728a951d46380d945
Daniel Sandler [Wed, 20 Jul 2011 00:14:51 +0000 (17:14 -0700)]
Merge "Fix stacked notifications."
Mathias Agopian [Wed, 20 Jul 2011 00:10:10 +0000 (17:10 -0700)]
Merge "implement: "Add an ANativeWindow API for SurfaceFlinger to suggest an optimal buffer orientation""
Andreas Huber [Tue, 19 Jul 2011 22:33:25 +0000 (15:33 -0700)]
Merge "More HLS fixes"
Mathias Agopian [Tue, 19 Jul 2011 22:24:46 +0000 (15:24 -0700)]
implement: "Add an ANativeWindow API for SurfaceFlinger to suggest an optimal buffer orientation"
Bug:
4487161
Change-Id: I883f34efe542c2a566d04966f873374f40c50092
Romain Guy [Tue, 19 Jul 2011 22:20:46 +0000 (15:20 -0700)]
Merge "Reduce the fade area to save bandwidth."
Elliott Hughes [Tue, 19 Jul 2011 22:00:58 +0000 (15:00 -0700)]
Merge "Fix a few things in the JNI docs."
Wu-cheng Li [Tue, 19 Jul 2011 21:47:20 +0000 (14:47 -0700)]
Merge "Disconnect the native window in CameraService::Client::disconnect."
Romain Guy [Tue, 19 Jul 2011 21:14:34 +0000 (14:14 -0700)]
Merge "Let HardwareRenderer support multiple threads."
Philip Milne [Tue, 19 Jul 2011 21:14:34 +0000 (14:14 -0700)]
Merge "Expose to the platform the ability to pick up changes in child visibility."
Dianne Hackborn [Tue, 19 Jul 2011 21:07:54 +0000 (14:07 -0700)]
Merge "Fix issue #
4869092: ResolverActivity occasionally fails to display"
Mathias Agopian [Tue, 19 Jul 2011 21:05:45 +0000 (14:05 -0700)]
Merge changes I4d50e985,Iaa2baa66
* changes:
use SurfaceTexture new scaling mode in SF
Add set_scaling_mode() to ANativeWindow.
Fabrice Di Meglio [Tue, 19 Jul 2011 21:04:28 +0000 (14:04 -0700)]
Merge "Code cleaning"
Gilles Debunne [Tue, 19 Jul 2011 20:42:54 +0000 (13:42 -0700)]
Merge "Layout changes in Settings"
Colin Cross [Tue, 19 Jul 2011 20:26:30 +0000 (13:26 -0700)]
Merge "Allow BoardConfig.mk to define an extension to dumpstate"
Russell Brenner [Tue, 19 Jul 2011 20:08:14 +0000 (13:08 -0700)]
Merge "Include DroidSansEthiopic-Regular as fallback font"
Mathias Agopian [Mon, 18 Jul 2011 23:15:08 +0000 (16:15 -0700)]
use SurfaceTexture new scaling mode in SF
SF now obeys SurfaceTexture's scaling mode instead
of inferring it from the buffer's size
Change-Id: I4d50e9851abedd7e64bfcfc8af9eefb9fb668529
Mathias Agopian [Wed, 13 Jul 2011 22:24:42 +0000 (15:24 -0700)]
Add set_scaling_mode() to ANativeWindow.
This allows to specify the scaling mode independently from
the buffer size.
Change-Id: Iaa2baa660445531a97d3fac192e580f4929c5d3b
Doug Zongker [Tue, 19 Jul 2011 20:00:30 +0000 (13:00 -0700)]
Merge "add rebootWipeCache call to RecoverySystem API"
Chris Craik [Tue, 19 Jul 2011 19:47:35 +0000 (12:47 -0700)]
Merge "Added TileBenchmark"
Wink Saville [Tue, 19 Jul 2011 19:42:01 +0000 (12:42 -0700)]
am
57aebc61: am
f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE
* commit '
57aebc6109f2059ba335a02bf95928a494cff4ba':
Fix FeatureUser leak in ConnectivityService
Kazuhiro Ondo [Tue, 19 Jul 2011 19:41:58 +0000 (12:41 -0700)]
am
5abddc73: am
bf361b59: Return IMEI SV if CDMA-LTE mode is used
* commit '
5abddc73a57da304029b6034b13f69079dcbd83a':
Return IMEI SV if CDMA-LTE mode is used
Wink Saville [Tue, 19 Jul 2011 19:39:42 +0000 (12:39 -0700)]
am
f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE
* commit '
f679d4cb92b6d1c193a154abb5ae8fb3a786fc43':
Fix FeatureUser leak in ConnectivityService
Kazuhiro Ondo [Tue, 19 Jul 2011 19:39:39 +0000 (12:39 -0700)]
am
bf361b59: Return IMEI SV if CDMA-LTE mode is used
* commit '
bf361b59e4e6c1c7c710e73260a77e9937f1fb59':
Return IMEI SV if CDMA-LTE mode is used
Wink Saville [Tue, 19 Jul 2011 19:37:18 +0000 (12:37 -0700)]
Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE
Chet Haase [Tue, 19 Jul 2011 18:40:34 +0000 (11:40 -0700)]
Merge "Don't constrain invalidation rect when not clipping children"
Wu-cheng Li [Tue, 19 Jul 2011 18:16:20 +0000 (11:16 -0700)]
Merge "Add camera new picture and new video broadcast intents."
Shimeng (Simon) Wang [Tue, 19 Jul 2011 18:15:49 +0000 (11:15 -0700)]
Merge "Change log msg since viewport can be changed before first layout."
James Dong [Tue, 19 Jul 2011 18:00:50 +0000 (11:00 -0700)]
Merge "Remove PV AVC decoder"
Philip Milne [Tue, 19 Jul 2011 17:36:46 +0000 (10:36 -0700)]
Merge "Fix build breakage."
Shimeng (Simon) Wang [Tue, 19 Jul 2011 17:31:52 +0000 (10:31 -0700)]
Merge "Add in i18n TLDs and new TLDs to the URL RegEx matcher."
Xavier Ducrohet [Tue, 19 Jul 2011 17:23:19 +0000 (10:23 -0700)]
am
9139868b: am
ba6c98db: am
82943ecf: am
d40c93f6: Merge "Add dependency generation to Aapt for R.java"
* commit '
9139868b6c5cb29b3665984225dceb0193fec31d':
Add dependency generation to Aapt for R.java
Xavier Ducrohet [Tue, 19 Jul 2011 17:23:16 +0000 (10:23 -0700)]
am
bf31250b: am
d5431ed5: am
2e659ae5: am
42755155: Merge "Copy once-created R.java into library projects"
* commit '
bf31250ba0858a2e72a3906a1f0216846683bc2e':
Copy once-created R.java into library projects
Xavier Ducrohet [Tue, 19 Jul 2011 17:18:28 +0000 (10:18 -0700)]
am
ba6c98db: am
82943ecf: am
d40c93f6: Merge "Add dependency generation to Aapt for R.java"
* commit '
ba6c98db8f21016f81ecac35bb0ea3c433044bb7':
Add dependency generation to Aapt for R.java
Xavier Ducrohet [Tue, 19 Jul 2011 17:18:25 +0000 (10:18 -0700)]
am
d5431ed5: am
2e659ae5: am
42755155: Merge "Copy once-created R.java into library projects"
* commit '
d5431ed5505a42e5e33c8bf7cc2ff72792979be9':
Copy once-created R.java into library projects
Fabrice Di Meglio [Tue, 19 Jul 2011 17:16:04 +0000 (10:16 -0700)]
Merge "Test Gallery layout direction."
Xavier Ducrohet [Tue, 19 Jul 2011 17:15:11 +0000 (10:15 -0700)]
am
82943ecf: am
d40c93f6: Merge "Add dependency generation to Aapt for R.java"
* commit '
82943ecfe2c4266cf3db50326240825fefcaa38f':
Add dependency generation to Aapt for R.java
Xavier Ducrohet [Tue, 19 Jul 2011 17:15:09 +0000 (10:15 -0700)]
am
2e659ae5: am
42755155: Merge "Copy once-created R.java into library projects"
* commit '
2e659ae59c17a0c0584d35b8c400a294c9d49e12':
Copy once-created R.java into library projects