Commit Graph

32019 Commits

Author SHA1 Message Date
Christopher Tate
e370534267 am b0183f0a: Harden against transiently unavailable backup transports
* commit 'b0183f0ae311966cff0e10e8139c56f97288d1f2':
  Harden against transiently unavailable backup transports
2013-11-19 11:46:48 -08:00
Christopher Tate
b0183f0ae3 Harden against transiently unavailable backup transports
The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.

Now with 100% less build break.

Bug 11716868

Change-Id: I2af4e93788068cfac97c0a48d3568c561eefa23d
2013-11-19 11:24:46 -08:00
Sascha Prueter
c7f7d1bf18 am f7044fec: Merge "Trying to unbreak build..." into klp-dev
* commit 'f7044fecee3ad1e2b2bfdd67c25b0c1536c83e18':
  Trying to unbreak build...
2013-11-18 23:27:07 -08:00
Sascha Prueter
d5965cb506 Trying to unbreak build...
Revert "Harden against transiently unavailable backup transports"

This reverts commit 8f98252afe.

Change-Id: I3aabb80f1a5932d530bce6b82d4b30c6cd1cdd5a
2013-11-19 06:51:21 +00:00
Christopher Tate
1e964ed808 am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev
* commit 'd6bbc54423c0fb70e9e0415b3e8c12a435d715a1':
  Harden against transiently unavailable backup transports
2013-11-18 18:44:47 -08:00
Christopher Tate
8f98252afe Harden against transiently unavailable backup transports
The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.

Bug 11716868

Change-Id: I4860fe3d4e99618b2cd194c83162bd7cbd5a83a9
2013-11-18 16:12:38 -08:00
Jeff Brown
5d0b18cddf am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev
* commit '3de885bef2f0f85ea76fd96c8f18cdd743ce66a4':
  Disallow applications from initiating cast screen.
2013-11-15 00:38:09 -08:00
Jeff Brown
3de885bef2 Merge "Disallow applications from initiating cast screen." into klp-dev 2013-11-15 08:35:50 +00:00
Jeff Brown
af574183c2 Disallow applications from initiating cast screen.
Only allow the system ui and settings to connect to a remote display.
To do this, we essentially hide the remote displays from applications
by using the ROUTE_TYPE_REMOTE_DISPLAY then add permission checks
around the operations that connect to them.

As a bonus, this may actually save power on devices since applications
that use MediaRouter will not longer be performing discover on
remote display routes at all.

Bug: 11257292
Change-Id: I9ea8c568df4df5a0f0cf3d0f11b39c87e2110795
2013-11-15 00:29:43 -08:00
Mindy Pereira
cce2e1944c am 5823352c: Cancel double tap mode on action_up
* commit '5823352c6c5bfa3824afacd023b01af537b5dfa0':
  Cancel double tap mode on action_up
2013-11-14 19:44:52 -08:00
Mindy Pereira
5823352c6c Cancel double tap mode on action_up
fixes b/11592408 Dragging immediately after double touch turns gesture into double touch drag

Change-Id: I3e7926a4f6f9ab4951f380bd004499c78b3bda69
2013-11-15 02:48:06 +00:00
Christopher Tate
6e5cf573f2 am 99437f25: Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev
* commit '99437f252b728f4946940f232c4b73b9dda76cfb':
  Ensure recipient can be launched before attempting broadcast delivery
2013-11-14 15:04:31 -08:00
Christopher Tate
99437f252b Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev 2013-11-14 22:59:20 +00:00
Christopher Tate
ba629da331 Ensure recipient can be launched before attempting broadcast delivery
User removal or eviction inherently races with broadcast delivery.  This
patch introduces a latest-possible recheck of the availbility of the
target application before attempting to send it a broadcast.

Once the process has actually been spun up the system is essentially
committed to presenting it as a running application, and there is no
later check of the availability of the app: the failure mode for
continuing to attempt delivery is a crash *in the app process*,
and is user-visible.

We now check the app+userid existence of the intended recipient
just prior to committing to launch its process for receipt, and
if it is no longer available we simply skip that receiver and
continue normally.

Bug 11652784
Bug 11272019
Bug 8263020

Change-Id: Ib19ba2af493250890db7371c1a9f853772db1af0
2013-11-14 12:37:31 -08:00
Matthew Williams
09d8e3cf4e am c68bb182: Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev
* commit 'c68bb18244aa12d19bea9f9d59f2fe0d81478904':
  SyncManager now returns copy on getCurrentSyncs()
2013-11-14 09:23:32 -08:00
Matthew Williams
c68bb18244 Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev 2013-11-14 17:18:58 +00:00
Satoshi Kataoka
1b570b571a am 5fd5aa3d: Fix compatibility issue on InputMethodSubtype
* commit '5fd5aa3d066fc12c92b5b6541d85ac243556223f':
  Fix compatibility issue on InputMethodSubtype
2013-11-13 22:25:01 -08:00
Satoshi Kataoka
5fd5aa3d06 Fix compatibility issue on InputMethodSubtype
Bug: 11032428
Change-Id: If722bbbfb69d00e1830007582d46a33319203eea
2013-11-14 15:08:39 +09:00
Adam Powell
75ae898376 am 48d2bcf2: Reset padding flags when set programmatically or implicitly from background
* commit '48d2bcf2ce2305356c5a4f0dfbb928dc5a4c8331':
  Reset padding flags when set programmatically or implicitly from background
2013-11-13 19:41:07 -08:00
Adam Powell
48d2bcf2ce Reset padding flags when set programmatically or implicitly from background
Bug 11673480

Change-Id: I4f33c7ae46e937302e625bf1f3260adb25843645
2013-11-13 19:21:50 -08:00
Matthew Williams
a7456e46f4 SyncManager now returns copy on getCurrentSyncs()
Bug:11559103
Added a new getCurrentSyncsCopy() that is public. The other version
is needed for internal SSE calls.

Change-Id: I0287f039a6f75abf04b65b85cb30f78353aeef4f
2013-11-13 18:17:54 -08:00
Svetoslav
fe666e848a am 4e041150: Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev
* commit '4e04115052a66d5a7836c5e7a9bfc1a5d6f3784b':
  Avoid NPE and add a warning log if a printing app misbehaves.
2013-11-13 17:50:22 -08:00
Svetoslav
4e04115052 Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev 2013-11-14 01:46:47 +00:00
Svetoslav
afd1967503 Avoid NPE and add a warning log if a printing app misbehaves.
An app can print only from an activity. If the activity is finished
before printing completes we destroy the PrintDocumentAdapter. The
app may however invoke some of the print callbacks after destruction
resulting in a NPE. This change checks if the adapter is destroyed
and if so does not crash while printing a meaningful log error with
the mistake of the app developer.

bug:11675274

Change-Id: I66539cfbd7583f52cb863a84ef8e40856f92ceed
2013-11-13 17:31:15 -08:00
Lajos Molnar
1197bc37e5 am 7e11b16b: VideoView: expand documentation on state save/restore limitations
* commit '7e11b16b9f8896170d492240a5fd50c8bd04105d':
  VideoView: expand documentation on state save/restore limitations
2013-11-13 16:40:26 -08:00
Lajos Molnar
7e11b16b9f VideoView: expand documentation on state save/restore limitations
Change-Id: I46f231d314fc4ae8d9d11389aa62a3e2698122ed
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11412889
2013-11-13 16:27:30 -08:00
Robert Greenwalt
4c514f2a68 am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev
* commit '594eeb082e548617ff5092496888c43457593c2b':
  Fix for the invalid Global Proxy Setting
2013-11-13 16:26:45 -08:00
Raj Mamadgi
92d02491ad Fix for the invalid Global Proxy Setting
Adding validation for Global Proxy setting before it is
being set.

Proxy is validated at the boot time also to make sure
the value set is valid.

Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
bug:11598568

Change-Id: Idff5ae81119d8143da096b5291ecbfbc5875cbd4
2013-11-14 00:08:21 +00:00
Jeff Sharkey
529ba10693 am 711d390b: Merge "Small DocumentsProvider doc improvements." into klp-dev
* commit '711d390be96531c5dfadb9a17e373f1e92ef16a1':
  Small DocumentsProvider doc improvements.
2013-11-13 14:34:49 -08:00
Jeff Sharkey
711d390be9 Merge "Small DocumentsProvider doc improvements." into klp-dev 2013-11-13 22:31:01 +00:00
Svetoslav
60020252db am 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev
* commit '14f300803b7d16a3c9632cb626529e873e4813f1':
  Update the PrintDocumentAdapter docs.
2013-11-13 13:34:00 -08:00
Jeff Sharkey
3b945405cf Small DocumentsProvider doc improvements.
Bug: 11670294
Change-Id: I5fb91c7665fc2a4531059ef9f2de0972ebabe1ea
2013-11-13 13:31:17 -08:00
Svetoslav
14f300803b Merge "Update the PrintDocumentAdapter docs." into klp-dev 2013-11-13 21:30:58 +00:00
Jean Chalard
d952ac4c17 am 218ecd43: Fix the docs build
* commit '218ecd43946001f07b60757db130ef5585d474d3':
  Fix the docs build
2013-11-12 22:27:47 -08:00
Jean Chalard
218ecd4394 Fix the docs build
Change-Id: I05f1f39aaa9d72201a7fd06377799246039cd505
2013-11-13 15:20:58 +09:00
Jean Chalard
383ef79d14 am 7d57b7a3: Merge "Improve documentation for InputType and EditorInfo." into klp-dev
* commit '7d57b7a35bd64d271b666f16aa1e85a4c2b99ca7':
  Improve documentation for InputType and EditorInfo.
2013-11-12 21:22:03 -08:00
Jean Chalard
7d57b7a35b Merge "Improve documentation for InputType and EditorInfo." into klp-dev 2013-11-13 05:19:36 +00:00
Scott Main
bb14698164 am 29610421: Merge "Revised some text while reading up on traceview. this is what\'s left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f" into klp-docs
* commit '29610421a32501661d6c20136c76ec426d6500fb':
  Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f
2013-11-13 02:53:40 +00:00
Scott Main
29610421a3 Merge "Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f" into klp-docs 2013-11-13 02:50:50 +00:00
Scott Main
c468240c1a Revised some text while reading up on traceview.
this is what's left of this older CL that was left for dead:
I5528b476d8110df51d45aaf690d878f72bc75c9f

Change-Id: I42f784d693c0a2a2e2e8ed4c582cbc10180191e7
2013-11-12 18:49:21 -08:00
Svetoslav
57b296f5a9 Update the PrintDocumentAdapter docs.
This change adds some clarification when a cancellation will be
requested during a layout or write. It also clarifies from which
thread the layout and write callbacks can be invoked.

Change-Id: Id20ff04c6fca8315849ed4a6c329da1b12bb6836
2013-11-12 16:21:00 -08:00
Craig Mautner
679ba4e86e am 6cd206b2: Merge "Relayout windows that handle their own config change." into klp-dev
* commit '6cd206b2aa0039c215fc0a4cc487471c4b3f1496':
  Relayout windows that handle their own config change.
2013-11-12 15:58:28 -08:00
Craig Mautner
6cd206b2aa Merge "Relayout windows that handle their own config change." into klp-dev 2013-11-12 23:56:21 +00:00
Craig Mautner
5d9f547720 Relayout windows that handle their own config change.
If a window claims to handle its own configuration change then we
won't destroy and recreate its window on a configuration change.
Normally that recreation triggers the first layout following
orientation change because mHaveFrame is false. Windows that handle
their own configuration changes never got a relayout pass following a
change in orientation.

This change passes the configuration changes that an application
handles into the AppWindowToken. If the app says it handles
orientation or screen size changes then a relayout will occur when the
configuration has changed.

Fixes bug 11647107.

Change-Id: Ie8d49fd050442ebbdcf0b805087894e3a2fc4be9
2013-11-12 14:02:52 -08:00
Fabrice Di Meglio
db976ea0fc am 3f183a23: Merge "Fix bug #11586041 Regression: text truncation in Clock" into klp-dev
* commit '3f183a234bef643080d4f9dce44bcaa68e5d4694':
  Fix bug #11586041 Regression: text truncation in Clock
2013-11-12 11:06:47 -08:00
Fabrice Di Meglio
3f183a234b Merge "Fix bug #11586041 Regression: text truncation in Clock" into klp-dev 2013-11-12 19:03:48 +00:00
Eino-Ville Talvala
ed676b2197 am 4d12d8be: Merge "Camera2: Add support for partial result metadata quirk" into klp-dev
* commit '4d12d8bef6d04c16fc18f10437ffc49bcdfabf9b':
  Camera2: Add support for partial result metadata quirk
2013-11-12 10:29:18 -08:00
Eino-Ville Talvala
4d12d8bef6 Merge "Camera2: Add support for partial result metadata quirk" into klp-dev 2013-11-12 18:27:06 +00:00
Scott Main
7774d8e723 am 44895333: clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630
* commit '44895333dad66be0ab5350b039d828f3da2a1b73':
  clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630
2013-11-12 17:56:03 +00:00
Scott Main
44895333da clarify that ANDROID_ID is unique for each user in multi-user environment.
bug: 8073630

Change-Id: Iff18e892a1e0422a85edd83f97ba4285f2171f74
2013-11-12 09:23:13 -08:00