38532 Commits

Author SHA1 Message Date
Guang Zhu
c834805036 Merge "bugfix: remove dump timeout message after dump is received" 2010-12-23 16:28:13 -08:00
Guang Zhu
f2f7f56e8b bugfix: remove dump timeout message after dump is received
Change-Id: I4061ccf77d47045a23065d27d6c9fa7452d085cc
2010-12-23 16:25:47 -08:00
Dianne Hackborn
4e24aac6ae Add some standard definitions for device heaps.
These can be included as desired by particular devices to configure
their Dalvik heap in a standard way.

Change-Id: I487c751d7c583b0e93552f16ab43a93314219778
2010-12-23 15:41:16 -08:00
Eric Fischer
cd17391944 Merge "Import revised translations." 2010-12-23 14:46:23 -08:00
Guang Zhu
97c2dc3202 Merge "Throw exception if webview dump times out" 2010-12-23 14:44:15 -08:00
Guang Zhu
f37a574f1c Throw exception if webview dump times out
if a webview dump times out, normally it's already in a bad state,
throwing runtime execption will generate a crash on the test case
and make the test move forward.

Change-Id: Id7430700db6b6d90160d60d23debd250b1731789
2010-12-23 14:37:31 -08:00
Dianne Hackborn
fefe3f689b am cc43401c: am 6eef0ca5: Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread
* commit 'cc43401cd10c681238e0be01de8fe14f5da94fb1':
  frameworks/base: Fix to release references in ActivityManagerService
2010-12-23 14:29:36 -08:00
Jeff Brown
8b71943942 am fa93584a: (-s ours) am c6f2b3b3: Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread
* commit 'fa93584a4fab6ca8d9348658dc30cedf76891753':
  Fix policy issues when screen is off. (DO NOT MERGE)
2010-12-23 14:27:29 -08:00
Dianne Hackborn
cc43401cd1 am 6eef0ca5: Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread
* commit '6eef0ca59438a15d14be8a72b6b29f01da91a5b8':
  frameworks/base: Fix to release references in ActivityManagerService
2010-12-23 14:22:32 -08:00
Dianne Hackborn
6eef0ca594 Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread 2010-12-23 14:19:03 -08:00
Vairavan Srinivasan
a207ce2aba frameworks/base: Fix to release references in ActivityManagerService
ServiceRecord's bindings is a hashmap to keep track of all active
bindings to the service. This is not cleared when the service is
brought down by activity manager. This adds up the references to
IntentBindRecords and its references to ServiceRecord. Fix is to
clear the bindings.

ServiceRecord's restarter is a reference to the service and is not
cleared when the service is brought down by activity manager. This
adds up the references to ServiceRecord. Fix is to set the reference
to null when the service is brought down by activity manager.

Change-Id: Ica448cd5f60192c8adb23209b5d0e2cf0c04e446
2010-12-23 14:16:56 -08:00
Eric Fischer
c16aea5ee8 Import revised translations.
Change-Id: Ia6a9c2838156dd6f83aea9c4809c57f663c710af
2010-12-23 14:12:01 -08:00
Andreas Huber
7f2b6c270b Merge "Squashed commit of the following:" 2010-12-23 13:11:29 -08:00
Jaikumar Ganesh
72b69fc5f1 Merge "Expose insecure rfcomm Bluetooth API." 2010-12-23 13:06:50 -08:00
Jaikumar Ganesh
6eef14a7fc Expose insecure rfcomm Bluetooth API.
This complements the secure rfcomm API.
The link key is unauthenticated and is subject to MITM attacks.
The link key may be encrypted depending on the type of Bluetooth device.
This helps apps which don't need the extra security or
have their own security layer built on top of the rfcomm link.

Change-Id: I71b2fa8de469ef98faa204b4dafac18a8e21d0d9
2010-12-23 13:05:23 -08:00
Jeff Brown
fa93584a4f am c6f2b3b3: Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread
* commit 'c6f2b3b302c06b8b7b81ec7e3a43a7df1813d0e0':
  Fix policy issues when screen is off. (DO NOT MERGE)
2010-12-23 12:43:48 -08:00
Jeff Brown
c6f2b3b302 Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread 2010-12-23 12:41:59 -08:00
Shimeng (Simon) Wang
8fb9eeb27f Merge "Merge WebKit at r73109: update web_user_agent string." 2010-12-23 11:41:54 -08:00
Gilles Debunne
9a99244a95 Merge "Fix for ellipsized text that has two lines at maximum." 2010-12-23 11:20:48 -08:00
Shimeng (Simon) Wang
f7e0351cfd Merge WebKit at r73109: update web_user_agent string.
Change-Id: Id38a7dd0f4467bdc343a696905d1ebe5debc1f57
2010-12-23 10:55:50 -08:00
Andreas Huber
54e6649e4c Squashed commit of the following:
commit eaeaa2672d4e0a82891493b2bde8bdd0c0e79a1b
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 23 10:26:48 2010 -0800

    Remove lowest bandwidth stream if using the legacy player.

    Change-Id: I2f885e26344996de9152f8fda9fd6bdef89bf953

commit 7d652972615b2750fd8f1c21b9fab0e136df2b82
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 23 10:14:36 2010 -0800

    Don't clear the packet source's format for legacy discontinuities.

    Change-Id: I9bd5a21b9bd28043ad38bd0658ccc8eda3c1079a

commit 2b18a45aac17cbfe1aa089d0f6510957d438dd64
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 23 10:13:55 2010 -0800

    Use NuPlayer for HTTP live streaming based on runtime property.

    adb shell setprop media.httplive.enable-nuplayer true

    Change-Id: I22738df3403985dc8e6992b1ab5da5747309f773

commit 50d899fb7b9ea52c3994b0a58e993998d926aeed
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 22 16:25:22 2010 -0800

    Make ACodec a lot less verbose.

    Change-Id: I94c7e499b61032321ffaf999f5ad2c913cde6a48

commit b19e1740cb4d02990a56844654b5d019987c6405
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 22 16:22:22 2010 -0800

    Wait until we have fresh codec-specific-data before instantiating the decoders

    after a discontinuity involving a format change.

    Change-Id: I7bcf9b5ae3319f08bf8978a117e8ee5220902e37

commit 06428c006906c9099e430aface3b439ff1d36ecc
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 22 15:20:38 2010 -0800

    Disable random seeks in the streaming tool for now.

    Change-Id: Ie86fde422dcfc4b2c7a01be51a193fda9c88cd71

commit e19db68f3bea8a61c191f60f6940f30e3a0d5f1b
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 22 15:20:27 2010 -0800

    Tweak HTTP live parameters.

    Change-Id: If4b71e12485facc523a8a43d8213d0feb190daab

commit 1e9942791538c2256b579d96c6c04264b0d8b087
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 22 14:48:23 2010 -0800

    Enable http live streaming through NuPlayer for http URLs containing the string m3u8

    Change-Id: I1691fe12ae8f1507fe3673313959cd50bc324624

commit 4c33f96a6e499ee0efe0e70b687094430cb7c1c0
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 22 14:40:27 2010 -0800

    Support for HTTP live streaming in NuPlayer.

    Change-Id: Iacba1c3ebaeb8d3b972185deaf4cff18c8009c54

commit ddf705ce553708bc5b13d89a878484cf839bd674
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 22 13:42:47 2010 -0800

    StreamingSource now a subclass of abstract NuPlayer::Source

    Change-Id: Ia6c7c639628910b9d1f37decc55da48b07a70de3

commit 9e04a8406b1882a8e3fdeb7b4d52db5ae70b970a
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 22 13:33:52 2010 -0800

    Refactor media data sourcing to NuPlayer::Source.

    Change-Id: I1db9fb08c4e527bf7b19c29978cf342c2b0a0bc9

Change-Id: I9610a097481dda58f22142eacda3ac2dba0b63f9
2010-12-23 10:27:40 -08:00
Irfan Sheriff
68b9f6f90a Merge "Fix wifi broadcasts" 2010-12-23 09:17:39 -08:00
Kristian Monsen
d486375c14 Merge "Only store Application context" 2010-12-23 07:35:40 -08:00
Shih-wei Liao
113ec8d41b Merge "Clean-up." 2010-12-23 07:08:54 -08:00
Shih-wei Liao
c5300f14ad Clean-up.
Change-Id: I43045da43a5e48e1bf759cd18c1b90d45f243450
2010-12-23 23:07:02 +08:00
Kristian Monsen
6b91b45e31 Only store Application context
Context from an Activity are not meant to be store past the
lifetime of the Activity.

Fix for bug 3306898

Change-Id: Ib2f12cbdc3ec8aa0a6adf4770e6be4569fa6402c
2010-12-23 12:47:39 +00:00
Xavier Ducrohet
71e83ff537 Merge "LayoutLib: improve bitmap support." 2010-12-23 00:13:24 -08:00
Xavier Ducrohet
afd8d608cf Merge "LayoutLib: support for layers." 2010-12-23 00:09:07 -08:00
Jim Miller
f9905b437a New thumbnail generation and centering in RecentApps
This centers the thumbnail in the given glow background and
reduces compositing by one window per recent item.

Change-Id: I228648022e12214fb3d8b66067e214cef5aaf8e9
2010-12-22 21:29:29 -08:00
Dianne Hackborn
dd830c2114 am 60238734: am 2dda21b9: Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread
* commit '6023873463331d30b7ed12942c3323f1b6975ed8':
  Another stab at fixing issue #3149290 java.lang.RuntimeException:...
2010-12-22 18:40:56 -08:00
Dianne Hackborn
6023873463 am 2dda21b9: Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread
* commit '2dda21b93f8a8e0fb70de44eae826bc68349813c':
  Another stab at fixing issue #3149290 java.lang.RuntimeException:...
2010-12-22 18:37:08 -08:00
Dianne Hackborn
2dda21b93f Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread 2010-12-22 18:34:40 -08:00
Dianne Hackborn
7becaeea7b Another stab at fixing issue #3149290 java.lang.RuntimeException:...
...Unable to pause activity
{com.android.settings/com.android.settings.applications.StorageUse}

Change-Id: Ibfa28a1c5af50dd150dfcafe71e905426d312643
2010-12-22 18:29:32 -08:00
Jeff Brown
182f7950b8 Merge "Enable touch splitting by default for Honeycomb apps." 2010-12-22 18:29:19 -08:00
Dianne Hackborn
00ee5b4685 Merge "Fix issue #3299143: Problem report for Hanping Chinese Dictionary Pro" 2010-12-22 17:44:14 -08:00
Dianne Hackborn
3b99ede362 Fix issue #3299143: Problem report for Hanping Chinese Dictionary Pro
Let's not crash if there is no clip.

Change-Id: I295031adf37fdd0997c39a2cffc2c6f602d7694e
2010-12-22 17:37:34 -08:00
Jim Miller
7b3724dd30 Merge "Fix 3298264: Update LockScreen DigitalClock with new font" 2010-12-22 17:35:26 -08:00
Jeff Brown
995e774319 Enable touch splitting by default for Honeycomb apps.
Also fixed some bad comments I noticed along the way.

Change-Id: I4328c8aaa22f48a5c1fd274e889abb7823747330
2010-12-22 17:00:33 -08:00
Jeff Brown
eb9f7a01b0 Fix policy issues when screen is off. (DO NOT MERGE)
Rewrote interceptKeyBeforeQueueing to make the handling more systematic.
Behavior should be identical except:
- We never pass keys to applications when the screen is off and the keyguard
  is not showing (the proximity sensor turned off the screen).
  Previously we passed all non-wake keys through in this case which
  caused a bug on Crespo where the screen would come back on if a soft key
  was held at the time of power off because the resulting key up event
  would sneak in just before the keyguard was shown.  It would then be
  passed through to the dispatcher which would poke user activity and
  wake up the screen.
- We propagate the key flags when broadcasting media keys which
  ensures that recipients can tell when the key is canceled.
- We ignore endcall or power if canceled (shouldn't happen anyways).

Changed the input dispatcher to not poke user activity for canceled
events since they are synthetic and should not wake the device.

Changed the lock screen so that it does not poke the wake lock when the
grab handle is released.  This fixes a bug where the screen would come
back on immediately if the power went off while the user was holding
one of the grab handles because the sliding tab would receive an up
event after screen turned off and release the grab handles.

Bug: 3144874
Change-Id: Iebb91e10592b4ef2de4b1dd3a2e1e4254aacb697
2010-12-22 16:00:21 -08:00
Jaikumar Ganesh
057898a9b5 Enable Bluetooth reverse tethering.
Change-Id: I84a508b64f18a1445b8ac424f2a36d56ef432375
2010-12-22 15:24:18 -08:00
Jaikumar Ganesh
15c7439acb Add TYPE_BLUETOOTH network interface for reverse tethering.
Change-Id: I2aa61ce15f57aea9e8fd3a4cb56799c8bc51e998
2010-12-22 15:24:18 -08:00
Dianne Hackborn
93e7d00f3f am 0dc0dab7: am 3b10aea5: Merge "Improve performance of WindowState.toString()"
* commit '0dc0dab71024e07431eb6d20b6165822da734902':
  Improve performance of WindowState.toString()
2010-12-22 15:00:08 -08:00
Dianne Hackborn
0dc0dab710 am 3b10aea5: Merge "Improve performance of WindowState.toString()"
* commit '3b10aea50c1044ff33d02727829c47c061f6e1c8':
  Improve performance of WindowState.toString()
2010-12-22 14:56:50 -08:00
Irfan Sheriff
b45e726bf5 Fix wifi broadcasts
Add the missing wifi disable broadcast and also send out
supplicant disconnect on shutdown.

Added unit test cases.

Bug: 3294055

Change-Id: Ia56a8ec9d17784c5aac5b8b369c04837f9057c54
2010-12-22 14:43:13 -08:00
Jim Miller
3d80811579 Merge "Fix 3290446: Reduce number of recents to fit in a single binder" 2010-12-22 14:27:25 -08:00
Martin Hibdon
760c881a30 Merge "Correctly save Activity's state in saveInstanceState" 2010-12-22 14:08:42 -08:00
James Dong
2116dc91e9 Expose AMRNB/WB and AAC encoder and related file output formats
Cherry-picked from GB

bug - 3305667

Change-Id: I116ba908666d712495a1bd2bcc47c35f274c7fae
2010-12-22 13:42:36 -08:00
Martin Hibdon
6bcda6387f Correctly save Activity's state in saveInstanceState
Prior to this change, saveInstanceState would
call directly to Activity.onSaveInstanceState(),
rather than performSaveInstanceState().
This meant that saveManagdDialogs() was not called,
so Activities running under a LocalActivityManager
do not get their dialogs restored on configuration changes.

Change-Id: Id45110a8716a86958c14f4b1ea5a84c9cdf107f1
2010-12-22 13:05:52 -08:00
James Dong
3d8b073a40 am 27d4ad2a: (-s ours) am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread
* commit '27d4ad2a5771ad025fa69f64b093d7429d94bfd3':
  Expose AMRNB/WB and AAC encoder and related file output formats - do not merge
2010-12-22 12:44:22 -08:00
James Dong
27d4ad2a57 am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread
* commit '2bf89b2197674ccc414ea60a61199562df9dc52b':
  Expose AMRNB/WB and AAC encoder and related file output formats - do not merge
2010-12-22 12:40:57 -08:00