OSDN Git Service
Svetoslav Ganov [Thu, 21 Jul 2011 18:48:57 +0000 (11:48 -0700)]
Merge "Activity selections not always persisted by AcitivtyChooserView."
Jaikumar Ganesh [Thu, 21 Jul 2011 18:43:03 +0000 (11:43 -0700)]
Merge "Fix notification manager delete intent."
Svetoslav Ganov [Thu, 21 Jul 2011 18:36:33 +0000 (11:36 -0700)]
Activity selections not always persisted by AcitivtyChooserView.
1. ActivityChooserModel was delegating the rsponsibility for reading
and persisting data to its clients i.e. ActivityChooserView and
the latter was persisting on detach from window. However, it is
not guaranteed that this callback will be received leading to
lack of presistence sometimes. Now the model is responsible for
loading and persisting thus voiding the posisbility a misbehaved
client to cause data loss.
bug:
5061638
Change-Id: Ia2b7bb659f7b9abe8869c94b3eaa726ddd4e4fad
Irfan Sheriff [Thu, 21 Jul 2011 18:28:51 +0000 (11:28 -0700)]
Merge "WifiWatchdogSM notification for first wifi disable"
Hong Teng [Thu, 21 Jul 2011 18:13:43 +0000 (11:13 -0700)]
Merge "fix for issue
4142219 Don't hard code platform-specific limitations-jni/java part"
Huahui Wu [Thu, 21 Jul 2011 18:08:55 +0000 (11:08 -0700)]
Merge "b/
4070489 Jumpy motion when switching fingers during zoom gesture."
Isaac Levy [Thu, 21 Jul 2011 01:15:30 +0000 (18:15 -0700)]
WifiWatchdogSM notification for first wifi disable
Also moved customizable settings into Settings.Secure and
added listeners for setting changes into the state machine.
Change-Id: Ia6859c71f7edae13062685867959adc423af4643
Huahui Wu [Wed, 20 Jul 2011 23:50:19 +0000 (16:50 -0700)]
b/
4070489 Jumpy motion when switching fingers during zoom gesture.
Change-Id: Ia7845cef5e58b4922e4475e48085b7b95e15bea2
Dirk Dougherty [Thu, 21 Jul 2011 00:07:44 +0000 (17:07 -0700)]
Cherrypick from hcmr2: doc change: more edits to Android 3.2 version notes.
Change-Id: I1fd616750b5693edf1f35a043ca4e11dfbe84327
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."
Narayan Kamath [Wed, 20 Jul 2011 09:41:52 +0000 (10:41 +0100)]
Fix some AudioTrack related issues.
(a) Call stop() when we've written less than the
AudioTrack buffer. This forces pending buffers to
get mixed.
(b) Introduce a minimum sleep time to avoid spinlocks
if they system is busy
Change-Id: If70937e8b4e8c5d02d7dadc0d3086f97a10eb7ef
Martijn Coenen [Thu, 21 Jul 2011 10:30:24 +0000 (12:30 +0200)]
Hide new interface to fix build.
Change-Id: I9d408ad5ab64399af67b37a01be973634a194ae2
Martijn Coenen [Thu, 21 Jul 2011 07:34:25 +0000 (09:34 +0200)]
Interfaces for enabling/disabling zero-click.
Change-Id: If7a90e67ca0f05cb18bea2861001e9cb6a14f4d6
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."
Jeff Hamilton [Thu, 21 Jul 2011 04:13:07 +0000 (23:13 -0500)]
Remove the hidden My Tag APIs.
Bug:
5048185
Change-Id: Iaf8a77e301fd378738db632e23674facd2c8fccc
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"
Mathias Agopian [Thu, 21 Jul 2011 01:51:15 +0000 (18:51 -0700)]
silence sensorservice when it's dropping events
Change-Id: Ib05862e545aa780821aa605e45ab189f530494b7
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"
Romain Guy [Thu, 21 Jul 2011 01:47:17 +0000 (18:47 -0700)]
Convert looper traces to traceview traces
Change-Id: If9238e8b00744118c1c4d2182727569f94deb638
Xavier Ducrohet [Thu, 21 Jul 2011 01:35:35 +0000 (18:35 -0700)]
Merge "Fix to compile for windows"
Josiah Gaskin [Thu, 21 Jul 2011 00:33:08 +0000 (17:33 -0700)]
Fix to compile for windows
This change includes a workaround for dirent.h on windows not
including d_type.
Change-Id: Ieaa3f298d2e6b32f2d8367384a1d02a2f5d06cca
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."
Dirk Dougherty [Mon, 18 Jul 2011 16:16:48 +0000 (09:16 -0700)]
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"
Dirk Dougherty [Sat, 16 Jul 2011 00:31:29 +0000 (17:31 -0700)]
Cherrypick from hcmr2: doc change: fix typo in 3.2 version notes
Dirk Dougherty [Fri, 15 Jul 2011 21:40:17 +0000 (14:40 -0700)]
Cherrypick from hcmr2: Doc change: fix typo in 3.2 version notes
Dirk Dougherty [Mon, 27 Jun 2011 00:14:12 +0000 (17:14 -0700)]
Cherrypick from honeycomb-mr2: Doc change: add HC MR2 version notes and update api level info.
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."
Jeff Brown [Wed, 20 Jul 2011 23:38:43 +0000 (16:38 -0700)]
Untangle MediaScanner error handling.
Bug:
5056917
Change-Id: I1a7a73579e3ba4e9709459329fc1901a28b0f4b1
Dirk Dougherty [Wed, 29 Jun 2011 17:51:50 +0000 (10:51 -0700)]
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
Matthew Xie [Thu, 21 Jul 2011 00:10:40 +0000 (17:10 -0700)]
when disconnectHeadsetInternal, allow it when the BT is not disabled
The old code allowed the disconnection only when BT is enabled. This
caused a bug during BT turning off that Headset connection failed
to disconnect.
Change-Id: Iba15a1595b6987064f071ad90bbb126a6edfe6b5
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
Hong Teng [Thu, 7 Jul 2011 01:33:09 +0000 (18:33 -0700)]
fix for issue
4142219
Don't hard code platform-specific limitations-jni/java part
Change-Id: Icde261b1caf29a8cf552884c97f3c9d0b41741a3
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
Josiah Gaskin [Tue, 7 Jun 2011 00:00:35 +0000 (17:00 -0700)]
Added Caching for PreProcessed PNGs
Added a cache management system for pre-processed PNG files
along with unit tests. The cache system will be used if
the --no-crunch flag is passed to AAPT during the package
phase. The cache can be updated by a call to 'aapt crunch'
(see usage statement). Also put in benchmarking code.
Change-Id: I58271fb2ee2f5f9075fd74d4ff6f15e7afabd05c
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."
James Dong [Wed, 20 Jul 2011 03:24:22 +0000 (20:24 -0700)]
Let the media recording framework release the Camera object when it is the owner
related-to-bug:
5050535,
5036813,
5051707
Change-Id: I88e10f65f087931e7f95ab26a018d59f7361103e
Jim Miller [Wed, 20 Jul 2011 22:01:06 +0000 (15:01 -0700)]
Fix
5056699: GridLayout should maintain static indices for "gone" views.
GridLayout currently ignores views with visibility="gone" when accounting for rows/columns.
Instead it should count views with visibility="gone" as rows/columns with row/height equal to 0.
This also makes it consistent with other ViewGroups like LinearLayout where "gone" views
don't change order and are still present (but hidden) within a container.
Change-Id: I289d4ee6275d5b49b1e1d79985484216bbf48089
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."
Adam Powell [Wed, 20 Jul 2011 21:17:56 +0000 (14:17 -0700)]
Fix bug
5038368 - Rules for collapsing action views.
Make collapsing action views exclusive on small screens with unsplit
action bars.
Change-Id: I11cc220acc7b6acddd25f2500404b47bfb405d5c
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"
Jesse Wilson [Wed, 20 Jul 2011 19:57:38 +0000 (12:57 -0700)]
Appease Doclava for ReferenceQueue.remove()
Bug: http://b/
5050245
Change-Id: I1a5483b01c9e27d990c5ea1758539aa423bf7616
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."
Jesse Wilson [Wed, 20 Jul 2011 19:23:23 +0000 (12:23 -0700)]
Skip byte order mark (BOM) in JsonReader
Bug: http://code.google.com/p/android/issues/detail?id=18508
Change-Id: I7652080d9ab475c75d0a811a6e2ede4975ebe063
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."
Daniel Sandler [Wed, 20 Jul 2011 18:41:41 +0000 (14:41 -0400)]
Fix dancing download notifications on phones.
There's always going to be some amount of visual noise when
notifications change order, and this can happen any time a
notification changes its "when" field (as is the case for
download progress bars). But in HC we added an optimization
that will reuse the current row if the download is the last
item in the list (so a fresher "when" will still put it at
the end), and that optimization is re-applied here.
Now, if you have multiple notifications all competing for
the top spot, I can't help you. But we had that problem
before (it just wasn't as egregious because we didn't have
the shiny animations).
Bug:
4971404
Change-Id: I5bcc905bdb19a8eb5b4494a6ba9825b4d5373caa
Fabrice Di Meglio [Wed, 20 Jul 2011 01:09:20 +0000 (18:09 -0700)]
Fix bug #
4772392 Check what needs to be done for RTL specific new attributes that are in public.xml
- cleanup public.xml
- make BiDiTest makefile non visible to the build system
- provide file for injecting the new attributes by hand
Change-Id: I5037ec323066ebd254be51fff7070a5a0101dff7
Dave Santoro [Fri, 15 Jul 2011 22:14:08 +0000 (15:14 -0700)]
Updates and fixes for the social stream API.
- Social stream photo updates should use the new photo storage
system instead of storing the image content in BLOBs.
- Package names need to be text, not numbers. The status update
documentation was incorrect.
- Social stream photos will include a URI the caller can open to
get the photo content.
- Removed the max photo bytes from the stream item limit query,
as we'll do appropriate resizing with the photo storage system.
Change-Id: I103ee1340c1a3772ae37add3684b0658c241a49c
Debashish Chatterjee [Wed, 20 Jul 2011 18:01:15 +0000 (19:01 +0100)]
Removed READ_WRITE_ALL_VOICEMAILS permission from framework.
This permission is meant to be a 'signature' permission and to be used
only by the contacts app. We recently moved it to framework/base as part
of opening up voicemail api into the SDK. However, the signature of
framework is different from contacts app. Consequently the contacts app
is not granted READ_WRITE_ALL_VOICEMAILS permission. This makes the
contacts app crash on start.
This fix removes the READ_WRITE_ALL_iVOICEMAILS from framework/base so
that the one defined in contacts provider is then used by the system.
Bug:
5054221
Change-Id: Iaa7a23fe95b0142978eff124e25fe2291dc7d212
Eric Laurent [Wed, 20 Jul 2011 18:04:18 +0000 (11:04 -0700)]
Merge "Fix issue
5012047: silent mode mutes music"
Mike Lockwood [Wed, 20 Jul 2011 15:37:40 +0000 (08:37 -0700)]
MediaScanner: Do separate bulk inserts for different media types
This should fix a bunch of problems introduced in the original bulk insert implementation
Also reverted two changes that are no longer necessary:
Revert "MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files"
This reverts commit
92e1314ad9ddbacfb806405e9aceeea4a8aae19f.
Revert "MediaScanner: fix breakage in updates"
This reverts commit
45aaa2a345292bb6d600822db602f25e261c0e50.
Change-Id: Ibed66393467761c2c1ce48deb09bcac505b7d221
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"
Martijn Coenen [Wed, 20 Jul 2011 14:06:34 +0000 (16:06 +0200)]
Support for getTimeout() (API).
Bug:
4492175
Change-Id: Ibc9a1b78d8c0992f47664d33760e0ce8dca67c64
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"
Alon Albert [Tue, 19 Jul 2011 08:16:09 +0000 (11:16 +0300)]
Add a getter for the active tag
Change-Id: I597e041867fba7efae41feea63fa196bc10e4aa2
Adam Powell [Wed, 20 Jul 2011 03:39:16 +0000 (20:39 -0700)]
Fix bug
5045004 - onActionModeFinished happens well before the
ActionBar is actually gone
Defer calling onDestroyActionMode until the action bar UI has fully
transitioned out of the mode and any bar-hiding layout change is ready
to happen. This helps apps better respond to layout changes resulting
from action mode UI.
Change-Id: I8e560ec566f4c3fa4a701c4b3aeb531c16169168
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"
Adam Cohen [Wed, 20 Jul 2011 01:05:33 +0000 (18:05 -0700)]
Adding resizeMinWidth/Height to AppWidgetProviderInfo
Change-Id: I17dc27829938a3f25a664d8255965cf9b67cb17e
Romain Guy [Wed, 20 Jul 2011 01:35:33 +0000 (18:35 -0700)]
Prevent NPE in TextView.getFadeTop()
Bug #
5051776
Change-Id: I2fc1ac4b31c06cfb224898ff39f6b63bfbcd77e8
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"
Alex Sakhartchouk [Wed, 20 Jul 2011 00:50:29 +0000 (17:50 -0700)]
Correctly call glviewport when surface changes.
Change-Id: I7ef1539e39ea67245bac5ee410deb5918fc5dfcf
Stephen Hines [Wed, 20 Jul 2011 00:45:49 +0000 (17:45 -0700)]
Merge "Extract BC metadata using a single call."