32162 Commits

Author SHA1 Message Date
Jeff Brown
fdcac45b67 Merge "Print extended SQLite error code." into jb-dev 2012-06-12 16:06:03 -07:00
Jeff Brown
ca309f212d Print extended SQLite error code.
Bug: 6538393
Change-Id: I2b010c6a1127887717af67ec588c3df8bf41afe6
2012-06-12 15:39:09 -07:00
Ying Wang
fbd982c14f am 9c463d9d: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '9c463d9d9f2601f139baad862b1b3276e126b12d':
  Import translations. DO NOT MERGE
2012-06-12 13:22:27 -07:00
Ying Wang
9c463d9d9f Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-12 13:20:19 -07:00
Ying Wang
26879578e8 Import translations. DO NOT MERGE
Change-Id: Iafceb53cc46753f25f460609e9db6fa227c15032
2012-06-12 13:17:59 -07:00
Daniel Sandler
602ad1c978 "Two actions ought to be enough for anybody."
Bug: 6650170
Change-Id: I5ee6990a8e556f9ee1fbfb0989db33f75b07f4ea
2012-06-12 16:06:27 -04:00
Adam Powell
0d637d6f88 am 579ec308: Merge "MediaRouter work" into jb-dev
* commit '579ec3086c9ce3616735bc3cf63246f052973a7f':
  MediaRouter work
2012-06-12 12:46:02 -07:00
Gilles Debunne
735b9598a2 am a447eaca: Merge "Prevent a crash when maxLines is set to 0" into jb-dev
* commit 'a447eaca555e45ebbbc5e4de2762e19dbca12980':
  Prevent a crash when maxLines is set to 0
2012-06-12 12:45:27 -07:00
Dianne Hackborn
f59467b3d6 am aabd9c23: Merge "Fix issue #6634325: View.setKeepScreenOn and..." into jb-dev
* commit 'aabd9c230f9849e8d52d2cb2e33bac7f163590d5':
  Fix issue #6634325: View.setKeepScreenOn and...
2012-06-12 12:45:24 -07:00
Jeff Brown
14afbba663 am ea6b8188: Merge "Improve ANR diagnostics." into jb-dev
* commit 'ea6b8188320202da072285b08fe6c0ee5c3f71e5':
  Improve ANR diagnostics.
2012-06-12 12:43:52 -07:00
Dianne Hackborn
007f2b40f9 am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev
* commit 'f9d80b6b940540b5d7be22ae310e047fcd2472a8':
  Rework media router to be per-context with global process state.
2012-06-12 12:43:20 -07:00
Jeff Brown
62007aba19 am 519e91ef: Merge "Detect bad behavior earlier in Choreographer." into jb-dev
* commit '519e91ef84aab79d0e18ba72e8a133d2306b821c':
  Detect bad behavior earlier in Choreographer.
2012-06-12 12:43:01 -07:00
Victoria Lease
1b15102fc0 am 72b8fc7e: Merge "Revert "Fix fake bold for fallback fonts in frameworks."" into jb-dev
* commit '72b8fc7e6da2f335880750513401d680417dfd13':
  Revert "Fix fake bold for fallback fonts in frameworks."
2012-06-12 12:42:54 -07:00
Adam Powell
bee681a1d5 am fbce66cb: Merge "Further work on MediaRouter" into jb-dev
* commit 'fbce66cb259cb63b43fda654db68152b8b4a2c2f':
  Further work on MediaRouter
2012-06-12 12:42:48 -07:00
Romain Guy
265888fe6a am 6b5caee4: Merge "Prevent crash in WebView when disabling the hw renderer Bug #6596807" into jb-dev
* commit '6b5caee49085c63b0197fd1e5e952f3b76abe33d':
  Prevent crash in WebView when disabling the hw renderer Bug #6596807
2012-06-12 12:42:32 -07:00
Svetoslav Ganov
5d15f40a19 am f372e331: Merge "NPE when iterating by character and word in Launcher widgets." into jb-dev
* commit 'f372e331e46bb9852520fa76c76f99ad99441893':
  NPE when iterating by character and word in Launcher widgets.
2012-06-12 12:42:27 -07:00
Dianne Hackborn
6892f1ec96 am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev
* commit '0f6471ace77387560988964ed0679f843bba6f1f':
  Fix issue #6641368: can't launch gallery
2012-06-12 12:41:36 -07:00
Eric Fischer
19e046c4d2 am 1b159f66: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '1b159f66eed528f9cda04a316a1958a7ce79ee48':
  Import translations. DO NOT MERGE
2012-06-12 12:41:20 -07:00
Chia-chi Yeh
a2becffcf2 am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev
* commit 'd667aebfb34085960e2b41a2f52d10ae749ec44c':
  VPN: move VpnDialogs away from system uid.
2012-06-12 12:41:12 -07:00
Adam Powell
579ec3086c Merge "MediaRouter work" into jb-dev 2012-06-12 12:04:24 -07:00
Adam Powell
b35c445f34 MediaRouter work
Fix a bug where MediaRouter would crash on creation

Add click listener for app-supplied extended settings on the route
selection dialog.

Change-Id: I2991db1720b5c574148e250526984592f4dc3c44
2012-06-12 11:26:39 -07:00
Jeff Brown
f195b80c2b resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp
Change-Id: I1426b282bb4c392b0a5bcb96760c04f215a26b4e
2012-06-12 11:10:26 -07:00
Gilles Debunne
a447eaca55 Merge "Prevent a crash when maxLines is set to 0" into jb-dev 2012-06-12 10:47:31 -07:00
Dianne Hackborn
aabd9c230f Merge "Fix issue #6634325: View.setKeepScreenOn and..." into jb-dev 2012-06-12 10:40:11 -07:00
Dianne Hackborn
9d0908919a Fix issue #6634325: View.setKeepScreenOn and...
...MediaPlayer.setScreenOnWhilePlaying seem broken

We need to correctly clear the keep screen on flag when the view
hierarchy request is gone...  and to do that, we need to keep the
actual state of the flag requested by the app.  Also when the app
changes its state, we need to compute the proper value based on
both the app request and any requests in the view hierarchy.

Bug: 6634325
Change-Id: I060e9a34a10faffbaa77c06098cf21298bb4969f
2012-06-11 18:35:41 -07:00
Jeff Brown
265f1ccc51 Improve ANR diagnostics.
When an ANR occurs, log the associated reason.

When an event takes too long to process (currently more than 2 seconds)
log basic information about the event including how long it actually
took.

Dump the contents of the inbound, outbound and wait queues as part
of dumpsys input.

Bug: 6574842
Change-Id: I9ab754c320f609cb86fe266c469a61e7032dfed6
2012-06-11 18:05:31 -07:00
Gilles Debunne
2fba3387c3 Prevent a crash when maxLines is set to 0
Bug 6642222

Using setMaxLines(0) and setMinHeight(30) causes a crash
because Layout#getLineRangeForDraw() returns a [0,0] interval
in that case.

Accessing the Direction in draw causes a NPE.

Change-Id: If50f9b554e3cdc598a721b623992e9196982838c
2012-06-11 17:46:26 -07:00
Geremy Condra
b4151b296f Merge "DO NOT MERGE Add API for file origin policy." 2012-06-11 16:53:43 -07:00
Dianne Hackborn
acfb11b7c4 am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)"
* commit '2e479fefbfcb388d2aa62978307420357f322441':
  Improved documentation (clarify on issue 8727)
2012-06-11 16:36:49 -07:00
Dianne Hackborn
82b131f274 am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"
* commit 'f6e39b068d1d5491dc3d73d73f598790688a1c4e':
  ApplicationThread: Check interface before invoking scheduleLowMemory
2012-06-11 16:36:42 -07:00
Dianne Hackborn
2e479fefbf am bb536096: Merge "Improved documentation (clarify on issue 8727)"
* commit 'bb5360966668ca8e97c02363b0d87dc9c9ae2451':
  Improved documentation (clarify on issue 8727)
2012-06-11 16:32:26 -07:00
Dianne Hackborn
f6e39b068d am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"
* commit 'a03696dc6b8128bd44dc700b62ef9b5fd3ac4534':
  ApplicationThread: Check interface before invoking scheduleLowMemory
2012-06-11 16:32:20 -07:00
Dianne Hackborn
f9d80b6b94 Merge "Rework media router to be per-context with global process state." into jb-dev 2012-06-11 16:31:55 -07:00
Dianne Hackborn
bb53609666 Merge "Improved documentation (clarify on issue 8727)" 2012-06-11 16:01:38 -07:00
Jeff Brown
519e91ef84 Merge "Detect bad behavior earlier in Choreographer." into jb-dev 2012-06-11 15:59:48 -07:00
Dianne Hackborn
a03696dc6b Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 2012-06-11 15:58:22 -07:00
Dianne Hackborn
b58b8f832d Rework media router to be per-context with global process state.
Change-Id: Ic1cb6f13e691d22783bcdafae85b7c75aec0a66f
2012-06-11 15:41:08 -07:00
Jeff Brown
4fdf9c6e2a Detect bad behavior earlier in Choreographer.
Detect wonky vsync timestamps (should they occur) and
warn loudly about them.

Warn when too many frames are skipped.  The threshold is pretty
conservative right now (only warn if at least 30 frames are skipped)
but it can be adjusted using system property.  Even skipping just a
couple of frames is enough to generate noticeable jank.
The threshold is currently intended to help track down bigger problems
such when an app does too much work on the UI thread.

Bug: 6574842
Change-Id: I4aac7e5e17d1fb51adb0510e318a72a28b3775ed
2012-06-11 15:25:48 -07:00
Victoria Lease
72b8fc7e6d Merge "Revert "Fix fake bold for fallback fonts in frameworks."" into jb-dev 2012-06-11 15:21:39 -07:00
Adam Powell
fbce66cb25 Merge "Further work on MediaRouter" into jb-dev 2012-06-11 15:00:57 -07:00
Victoria Lease
aa0980afab Revert "Fix fake bold for fallback fonts in frameworks."
This reverts commit b26fa0ce68d3311b2fdffb930b27d897e481dd5a
2012-06-11 14:46:04 -07:00
Romain Guy
6b5caee490 Merge "Prevent crash in WebView when disabling the hw renderer Bug #6596807" into jb-dev 2012-06-11 14:15:40 -07:00
Svetoslav Ganov
f372e331e4 Merge "NPE when iterating by character and word in Launcher widgets." into jb-dev 2012-06-11 14:06:29 -07:00
Romain Guy
527ee91b60 Prevent crash in WebView when disabling the hw renderer
Bug #6596807

A crash would occur in the following situation:
- WebView registers a functor with the hardware renderer
- The hardware renderer gets disabled
- WebView attemps to unregister its functor

Unregistering the functor fails because the hardware renderer is now disabled.
When the renderer becomes enabled again, the functor is invoked, which leads
to a native crash.

This change simply allows functors to always be unregistered, even when the
renderer is disabled. A disabled renderer only means that it will not be used
for rendering; as such, unregistering a functor is a valid operation and
should be allowed.

Change-Id: I0ff897a0cca7e048c609033215cd0f7f5c940bcc
2012-06-11 13:24:30 -07:00
Adam Powell
d0d2cda9d4 Further work on MediaRouter
Remove volume control and tracking. This will be handled by extensions
to existing audio and media APIs for now.

Tweak/refine other aspects of the API. Pass the router to callbacks for
easier future-proofing. Add group/ungroup callback methods.

Change-Id: Ib69e76e5f46280a9002b545bcf4cbc7b839844ee
2012-06-11 13:17:44 -07:00
Dianne Hackborn
0f6471ace7 Merge "Fix issue #6641368: can't launch gallery" into jb-dev 2012-06-11 13:09:22 -07:00
Dianne Hackborn
2bd8d0403b Fix issue #6641368: can't launch gallery
This is a revert of 1db36528b12395b9ed9bf8a1005a6d4ace737627,
but with comments added so I don't make this mistake again. :)

Change-Id: I053216279e3721f08f32f561bb989736ef619f82
2012-06-11 12:27:05 -07:00
Svetoslav Ganov
bbd31559f3 NPE when iterating by character and word in Launcher widgets.
1. The character and word iterators were use the application
   context to keep track of locale changes. However, for widgets
   the context from which the app context is obtained is custom
   created therefore the app context is null and the iterators
   code does not expect that. Now we are caching the locale
   and update it when the configuration changes.

bug:6642281

Change-Id: I3fd201ab9e4efd79e3bdc8afd8ee644e4354a7fb
2012-06-11 12:18:09 -07:00
Jean-Baptiste Queru
80d21f2f83 am 19703b13: Merge "Avoid memory leak in the Shutdown confirmation dialog."
* commit '19703b13a6201812ebcf73904feb700aeb1afb45':
  Avoid memory leak in the Shutdown confirmation dialog.
2012-06-11 12:03:32 -07:00
Eric Fischer
1b159f66ee Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-11 11:56:22 -07:00