OSDN Git Service

android-x86/frameworks-base.git
9 years agoMerge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp...
Alan Viverette [Mon, 26 Jan 2015 19:16:39 +0000 (19:16 +0000)]
Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev

9 years agoMerge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp...
Mike Lockwood [Mon, 26 Jan 2015 18:52:38 +0000 (18:52 +0000)]
Merge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp-mr1-dev

9 years agoPrevent drag-to-open from cycling pressed state, propagate hotspot
Alan Viverette [Mon, 26 Jan 2015 18:24:08 +0000 (10:24 -0800)]
Prevent drag-to-open from cycling pressed state, propagate hotspot

Avoids unnecessary changes to pressed state. Ensures hotspot propagates
to both the list view and the list item view since both receive the
pressed state.

Bug: 19134424
Change-Id: If2496ce2042e43fe1c1efd527eeca10dc53e1f4a

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Jan 2015 14:16:38 +0000 (08:16 -0600)]
Import translations. DO NOT MERGE

Change-Id: If6bad1c33638d232a6f320637ac0e13c8a67adfb
Auto-generated-cl: translation import

9 years agoMerge "Update badge assets" into lmp-mr1-dev
Alexandra Gherghina [Mon, 26 Jan 2015 11:59:20 +0000 (11:59 +0000)]
Merge "Update badge assets" into lmp-mr1-dev

9 years agoMerge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev
Benjamin Franz [Mon, 26 Jan 2015 10:49:47 +0000 (10:49 +0000)]
Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev

9 years agoUpdate badge assets
Alexandra Gherghina [Mon, 26 Jan 2015 09:36:48 +0000 (09:36 +0000)]
Update badge assets

Bug: 18829152
Change-Id: I26936dc528b8d56e37eb02fa04177ad3f225b007

9 years agoMerge "Ensure notifications are sent when locking/unlocking location share" into...
Zoltan Szatmary-Ban [Mon, 26 Jan 2015 10:36:12 +0000 (10:36 +0000)]
Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev

9 years agoMerge "Remove entries from config_tether_apndata for some carriers." into lmp-mr1-dev
Sanket Padawe [Fri, 23 Jan 2015 23:54:46 +0000 (23:54 +0000)]
Merge "Remove entries from config_tether_apndata for some carriers." into lmp-mr1-dev

9 years agoAccessibility: Sometimes cannot interact with nav bar items.
Svetoslav [Fri, 23 Jan 2015 22:40:52 +0000 (14:40 -0800)]
Accessibility: Sometimes cannot interact with nav bar items.

If there is a window with the accessibility focus we want to click
on the accessibility focused view in this window. The logic to
compute the bounds of the window was using the wrong window id,
hence getting an incorrect result. As a consequence in some cases
the user could not click on accessiiblity focused controls in the
nav bar.

bug:18889611

Change-Id: I89aee3ae2ffe27fe29819049c287a7155154c65b

9 years agoMerge "Accessibilty: Cannot click on views in a scrollable container covered by the...
Svetoslav [Fri, 23 Jan 2015 22:22:17 +0000 (22:22 +0000)]
Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev

9 years agoMerge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev
Jinsuk Kim [Fri, 23 Jan 2015 21:10:37 +0000 (21:10 +0000)]
Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev

9 years agoMerge "Prevent memory corruption from use-after-free" into lmp-mr1-dev
John Reck [Fri, 23 Jan 2015 20:24:56 +0000 (20:24 +0000)]
Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev

9 years agoMerge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic...
Miao Wang [Fri, 23 Jan 2015 19:17:11 +0000 (19:17 +0000)]
Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev

9 years ago[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram
Miao Wang [Fri, 23 Jan 2015 17:41:04 +0000 (09:41 -0800)]
[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram
Intrinsic

Bug: 19035242
Bug: 19124958
Change-Id: I9e806d7a0786e728c5f23607dc67ca5d755e12ed

9 years agoPrevent memory corruption from use-after-free
John Reck [Fri, 23 Jan 2015 18:57:15 +0000 (10:57 -0800)]
Prevent memory corruption from use-after-free

Bug: 19035637

If an app tries to call recycle() on a Bitmap that has
already been finalized it will result in use-after-frees. This is
bad. Avoid this by setting the pointer to 0 and checking for this

Change-Id: I12d73703a0f95b05fe4c2fd8e9c01b6a3f2f023b

9 years agoMTP: Fix partial implementation of 5 new audio specific properties
Mike Lockwood [Fri, 23 Jan 2015 18:50:08 +0000 (10:50 -0800)]
MTP: Fix partial implementation of 5 new audio specific properties

In change Ic5b3fb75309893caae1a4f4b56068a543847f1f7, we added partial
support for the MTP properties:

MTP_PROPERTY_AUDIO_WAVE_CODE,
MTP_PROPERTY_BITRATE_TYPE
MTP_PROPERTY_AUDIO_BITRATE
MTP_PROPERTY_NUMBER_OF_CHANNELS
MTP_PROPERTY_SAMPLE_RATE

However we were not returning any values for these properties in the result
of the MTP GetObjectPropList command. Strangely, this triggers a nasty bug
in Windows 7 that results in data loss.  When copying a directory containing
several MP3 files from one location on the device to another, Windows will
copy only some of the files to the new location, but delete all of the originals.
Finishing the implementation of these new object properties for some unknown
reason stops this bad behavior in Windows 7.

Bug: 19018427
Change-Id: I5fd3b91a89b31827d3100686445cef6795fe0f3f

9 years agoMerge "Allow infinite-repeat zero-duration animators to continue repeating" into...
Chet Haase [Fri, 23 Jan 2015 17:56:57 +0000 (17:56 +0000)]
Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev

9 years agoDon't compute flags length for scan response
Prerepa Viswanadham [Fri, 16 Jan 2015 18:40:11 +0000 (10:40 -0800)]
Don't compute flags length for scan response

Bug 19041626

Change-Id: I7d8aa12e133477fc60d12b474f57313961021975

9 years agoAvoid NullPointerException if createUser returns null
Benjamin Franz [Fri, 23 Jan 2015 15:32:30 +0000 (15:32 +0000)]
Avoid NullPointerException if createUser returns null

If createUser returns null, we run into a NullPointerException
in createAndInitializeUser. This can happen when the policy
DISALLOW_ADD_USER is set.

Bug: 19121141
Change-Id: Id4bda832a243fa42c31eb5a176ecaa248aee68f5

9 years agoMerge "SysUI: Don't drop HUN notification when clicked" into lmp-mr1-dev
Christoph Studer [Fri, 23 Jan 2015 16:51:45 +0000 (16:51 +0000)]
Merge "SysUI: Don't drop HUN notification when clicked" into lmp-mr1-dev

9 years agoMerge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev
Benjamin Franz [Fri, 23 Jan 2015 14:33:04 +0000 (14:33 +0000)]
Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev

9 years agoEnsure notifications are sent when locking/unlocking location share
Zoltan Szatmary-Ban [Fri, 16 Jan 2015 12:36:29 +0000 (12:36 +0000)]
Ensure notifications are sent when locking/unlocking location share

When the restriction 'DISALLOW_SHARE_LOCATION' is applied or removed on a user
it is important to send out notifications to content observers of
LOCATION_PROVIDERS_ALLOWED.

Bug: 18995405
Change-Id: I8b3910a423a012ea9d15470eec101723c9f0eaf7

9 years agoMerge "Support connecting to networks with misconfigured subnet masks." into lmp...
Lorenzo Colitti [Fri, 23 Jan 2015 12:50:31 +0000 (12:50 +0000)]
Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev

9 years agoSupport connecting to networks with misconfigured subnet masks.
Lorenzo Colitti [Tue, 20 Jan 2015 06:53:02 +0000 (15:53 +0900)]
Support connecting to networks with misconfigured subnet masks.

In K and earlier, we would connect to a network where the gateway
was not covered by the subnet mask of the IP address. This is an
invalid configuration, but it used to work, and other OSes appear
to accept it too, so support it.

Bug: 19067207
Change-Id: I822e1d754b336691b675438eefa959a3d75fd07b

9 years agoCEC: Handles initiation of press-and-hold correctly
Jinsuk Kim [Fri, 23 Jan 2015 06:39:00 +0000 (15:39 +0900)]
CEC: Handles initiation of press-and-hold correctly

Previously the time gap between the first and the second key event
for repeated keys(press-and-hold) can be bigger than the threshold,
which violates CEC spec. This CL rectifies it by managing its own
state rather than relying on Android key handler.

Bug: 19117830

Change-Id: Iedfa48f9ab826252e8616d1c3b7491e8b8333c81

9 years agoFix broken build
Jinsuk Kim [Fri, 23 Jan 2015 08:13:28 +0000 (17:13 +0900)]
Fix broken build

Updated system-current.txt

Change-Id: I1f80d5543f0a828cf59d50d1271916a1210674d3

9 years agoMerge "CEC: Add logic to return to internal source" into lmp-mr1-dev
Jinsuk Kim [Fri, 23 Jan 2015 06:51:57 +0000 (06:51 +0000)]
Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev

9 years agoMerge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp...
Lorenzo Colitti [Fri, 23 Jan 2015 05:57:37 +0000 (05:57 +0000)]
Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev

9 years agoUse the proper IpPrefix and LinkAddress constructors in VPN code.
Lorenzo Colitti [Tue, 20 Jan 2015 04:40:58 +0000 (13:40 +0900)]
Use the proper IpPrefix and LinkAddress constructors in VPN code.

This simplifies the code, and also makes it possible for
users to point multicast routes at the VPN. The LinkAddress
objects we were previously using to construct the RouteInfo do
not accept these, but IpPrefix objects do.

Bug: 18485968
Change-Id: Ie914a2eb359b78161810ee473df725059f944f4e

9 years agoAccessibilty: Cannot click on views in a scrollable container covered by the toolbar.
Svetoslav [Fri, 23 Jan 2015 02:49:13 +0000 (18:49 -0800)]
Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.

In accessibility mode we calculate a point where to click in the accessibility
focused view as a bridge-gap solution before switching to accessibility click
actions. We cannot detect whether a view is covered by another one that consumes
all touch events, and therefore we may click on the wrong target. This was the
case with the toolbar. As a result a partially scrolled view in a scrollable
container covered by a toolbar cannot be activated and this is not an edge case.

bug:18986806

Change-Id: Ib41470c39806cec13e9b00b319879cd7f3412ab5

9 years agoMerge "AAPT: Use the right enum when checking for density configurations" into lmp...
Adam Lesinski [Fri, 23 Jan 2015 02:29:49 +0000 (02:29 +0000)]
Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev

9 years agoAAPT: Use the right enum when checking for density configurations
Adam Lesinski [Fri, 23 Jan 2015 02:19:44 +0000 (18:19 -0800)]
AAPT: Use the right enum when checking for density configurations

Bug:19116675
Change-Id: I2322d8d6bdf890005c80014273e5d07df735ed50

9 years agoAllow infinite-repeat zero-duration animators to continue repeating
Chet Haase [Fri, 23 Jan 2015 01:57:37 +0000 (17:57 -0800)]
Allow infinite-repeat zero-duration animators to continue repeating

A recent change to ValueAnimator caused infinitely repeating animators with
duration 0 to be ended immediately. BatterySaver mode can cause animators
to have 0 duration, which means that apps depending on animator update events
no longer receive those events due to this behavior change.

The fix is to restore the previous behavior of allowing repeating animators
to continue, regardless of duration.

Issue #19113776 Fix infinite-repeating, zero-duration animator behavior

Change-Id: I4d1c7afb6d06ca45ef41db73c160f6a6d5754e24

9 years agoRemove entries from config_tether_apndata for some carriers.
Sanket Padawe [Fri, 23 Jan 2015 01:43:08 +0000 (17:43 -0800)]
Remove entries from config_tether_apndata for some carriers.

+ Remove entries from config_tether_apndata when primary carrier requires
DUN apn and the mvno does not.

Bug: 19006861

Change-Id: Idf93fe2302662ce2b25e72277080bbc9d410b2de

9 years agoMerge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev
Eino-Ville Talvala [Fri, 23 Jan 2015 00:05:25 +0000 (00:05 +0000)]
Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev

9 years agoMerge "Even more debug for bug 17721767." into lmp-mr1-dev
Craig Mautner [Thu, 22 Jan 2015 23:17:46 +0000 (23:17 +0000)]
Merge "Even more debug for bug 17721767." into lmp-mr1-dev

9 years agoEven more debug for bug 17721767.
Craig Mautner [Thu, 22 Jan 2015 22:28:03 +0000 (14:28 -0800)]
Even more debug for bug 17721767.

This time adding events for stack movement and focus change.

Change-Id: Icdff9763ac2daf85c615992fa2c8e418e907908c

9 years agoMerge "Check in "current" system API files." into lmp-mr1-dev
Ying Wang [Thu, 22 Jan 2015 20:36:05 +0000 (20:36 +0000)]
Merge "Check in "current" system API files." into lmp-mr1-dev

9 years agoam 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines...
Ricardo Cervera [Thu, 22 Jan 2015 18:27:57 +0000 (18:27 +0000)]
am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
automerge: 65ab86c

* commit '65ab86cf1ad414612ac57e14f581e0ffb1819e14':
  docs: Fixes to the watch faces design guidelines

9 years agoam 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines...
Ricardo Cervera [Thu, 22 Jan 2015 18:02:30 +0000 (18:02 +0000)]
am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs

* commit '02d093ca675535f1a7f702a9fffd277123cea8ca':
  docs: Fixes to the watch faces design guidelines

9 years agoam bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
Ricardo Cervera [Thu, 22 Jan 2015 17:56:54 +0000 (17:56 +0000)]
am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs

* commit 'bdfcd56e7f01b7bb1f50c932792b9528c67892e5':
  docs: Fixes to the watch faces design guidelines

9 years agoMerge "docs: Fixes to the watch faces design guidelines" into lmp-docs
Ricardo Cervera [Thu, 22 Jan 2015 17:50:47 +0000 (17:50 +0000)]
Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs

9 years agoMerge "QS: Fix second line in dual tiles" into lmp-mr1-dev
Jason Monk [Thu, 22 Jan 2015 17:49:04 +0000 (17:49 +0000)]
Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev

9 years agodocs: Fixes to the watch faces design guidelines
Ricardo Cervera [Wed, 14 Jan 2015 16:29:38 +0000 (08:29 -0800)]
docs: Fixes to the watch faces design guidelines

Bug: 19001253

Change-Id: I356b887de71710afa27acc7544d0efdc3a857e91

9 years agoam edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaratio...
Luan Nguyen [Thu, 22 Jan 2015 17:44:45 +0000 (17:44 +0000)]
am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
automerge: 6117147

* commit '61171477918ea55c70c706f062019f5cd2194043':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)

9 years agoam edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaratio...
Luan Nguyen [Thu, 22 Jan 2015 17:35:31 +0000 (17:35 +0000)]
am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)

* commit 'edb9ba54f7be81faacda4ee36824c6f8cd314fb3':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)

9 years agoam 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var...
Luan Nguyen [Thu, 22 Jan 2015 17:29:30 +0000 (17:29 +0000)]
am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)

* commit '1dd76ea2760f84496a5b82435fc35d7c28a6dd6d':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)

9 years agoSysUI: Don't drop HUN notification when clicked
Christoph Studer [Thu, 22 Jan 2015 14:02:49 +0000 (15:02 +0100)]
SysUI: Don't drop HUN notification when clicked

A clicked notification is not guaranteed to be removed,
so instead of dropping a clicked HUN notification we have
to release it to the shade.

Bug: 19093631
Change-Id: I73b88af774e49e89c8a601873c48cc5f5eed0224

9 years agoAvoid SecurityException when calling getUserData
Benjamin Franz [Wed, 14 Jan 2015 18:22:42 +0000 (18:22 +0000)]
Avoid SecurityException when calling getUserData

Currently we risk getting a SecurityException in a number of places,
where getUserData is called for a different user than the calling user.
To avoid this, the caller is cleared in a helper function.

Bug: 18662452
Change-Id: Ibc131c602e52d9f013fe739a9c18e693181ded67

9 years agodocs: Fix companion configuration (18864041)
Luan Nguyen [Wed, 21 Jan 2015 23:16:36 +0000 (15:16 -0800)]
docs: Fix companion configuration (18864041)
Fix declaration of var and incorrect method call (18617393)

bug: 18864041
bug: 18617393
Change-Id: Ic31e44acfe7338f56acdbbd97ba8cc1e87042b53

9 years agoQS: Fix second line in dual tiles
Jason Monk [Thu, 22 Jan 2015 15:39:37 +0000 (10:39 -0500)]
QS: Fix second line in dual tiles

QSDualTileLabel is no longer a FrameLayout (now a LinearLayout),
so it does not need the top padding based on the caret size
anymore.

Bug: 18725348
Change-Id: Ibd3aaa20e7cdb35ba585cc5c8981c64efb5c66fe

9 years agoMerge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev
Jason Monk [Thu, 22 Jan 2015 14:11:52 +0000 (14:11 +0000)]
Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev

9 years agoMerge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev
Nicolas Prevot [Thu, 22 Jan 2015 10:22:05 +0000 (10:22 +0000)]
Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev

9 years agoCEC: Add logic to return to internal source
Jinsuk Kim [Mon, 19 Jan 2015 03:39:06 +0000 (12:39 +0900)]
CEC: Add logic to return to internal source

This CL introduces a logic that, upon receiving <Inactive Source>
from the active source or a corresponding MHL subcommand, lets
the service return to one of internal inputs.

Introduced to handle it is a new type for HdmiDevice (INACTIVE)
that will be passed to input change listeners. The callback
is expected to transform to other mechanism such as intent,
to let TV app to decide which input to switch to, which will
be one of non-HDMI input that was viewed previously.

Bug: 19008579

Change-Id: I1922f4cd20e9220411061bb9d9fbe5fbc5676d48

9 years agoMerge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev
Erik Kline [Thu, 22 Jan 2015 07:07:35 +0000 (07:07 +0000)]
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev

9 years agoMerge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev
Jim Miller [Thu, 22 Jan 2015 02:37:38 +0000 (02:37 +0000)]
Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev

9 years agoMerge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev
Jinsuk Kim [Thu, 22 Jan 2015 02:19:36 +0000 (02:19 +0000)]
Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev

9 years agoMerge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into...
Wonsik Kim [Thu, 22 Jan 2015 01:52:06 +0000 (01:52 +0000)]
Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev

9 years agoMerge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input alloca...
Miao Wang [Thu, 22 Jan 2015 01:16:29 +0000 (01:16 +0000)]
Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev

9 years agoCamera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
Eino-Ville Talvala [Tue, 20 Jan 2015 20:30:59 +0000 (12:30 -0800)]
Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)

Add missing implementation.
Also improve docs for flexible Surface sources.

Bug: 19076351
Change-Id: I1f1126a291480dcb68d3dd90825b5994e54dcc99

9 years agoMerge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp...
Craig Mautner [Thu, 22 Jan 2015 00:25:17 +0000 (00:25 +0000)]
Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev

9 years agoMerge "Fix legacy request removal." into lmp-mr1-dev
Robert Greenwalt [Wed, 21 Jan 2015 23:50:26 +0000 (23:50 +0000)]
Merge "Fix legacy request removal." into lmp-mr1-dev

9 years agoMerge "Rerun entitlementcheck on sim change." into lmp-mr1-dev
Robert Greenwalt [Wed, 21 Jan 2015 23:49:11 +0000 (23:49 +0000)]
Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev

9 years agoam 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into...
Andrew Solovay [Wed, 21 Jan 2015 23:33:10 +0000 (23:33 +0000)]
am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954
automerge: d4cf09d

* commit 'd4cf09d3a0f90d61386eb1713ef2ed4ade00c061':
  docs: WebView security notes for apps on pre-K devices

9 years agoam f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168...
Luan Nguyen [Wed, 21 Jan 2015 23:31:44 +0000 (23:31 +0000)]
am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs automerge: 8884eda
automerge: de9bd40

* commit 'de9bd40e21696ceeffc67ec24e6e43975461bc60':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).

9 years agoam 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into...
Andrew Solovay [Wed, 21 Jan 2015 23:22:45 +0000 (23:22 +0000)]
am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs
automerge: e628954

* commit 'e628954ea49da6a798879815d221f4d2d871e79a':
  docs: WebView security notes for apps on pre-K devices

9 years agoam f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168...
Luan Nguyen [Wed, 21 Jan 2015 23:21:24 +0000 (23:21 +0000)]
am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs
automerge: 8884eda

* commit '8884edaaeb0375338f5cf6474c91c3f55f44a172':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).

9 years agoam 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into...
Andrew Solovay [Wed, 21 Jan 2015 23:10:59 +0000 (23:10 +0000)]
am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs

* commit '78f4342fac982a130a62dac2a459cef2a4c29f5a':
  docs: WebView security notes for apps on pre-K devices

9 years agoam f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168...
Luan Nguyen [Wed, 21 Jan 2015 23:10:55 +0000 (23:10 +0000)]
am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs

* commit 'f082f8980e742e9a60aeb91271caff38e10cf0a8':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).

9 years agoCEC: Let playback device switch TV input after bootup
Jinsuk Kim [Fri, 16 Jan 2015 23:46:18 +0000 (08:46 +0900)]
CEC: Let playback device switch TV input after bootup

Saves users from having to switch TV input manually to a playback device
after it boots up.

Bug: 19046176
Change-Id: I0a4fae1036138ce2e19cbac9fdd9dda41bdcf89f

9 years agoResume home activity can skip resume and cause ANR. DO NOT MERGE
louis_chang [Wed, 21 Jan 2015 11:01:52 +0000 (19:01 +0800)]
Resume home activity can skip resume and cause ANR. DO NOT MERGE

Symptom:
In some scenario, there might have two home tasks
in the home stack. If the top home task was finishing
and expected to return to home stack, no activity
will resume.

Root Cause:
Unable to perform resumeHomeStackTask() because the
resumeTopActivityLocked() has been prevented to invoke
recursively.

Solution:
Just resume the next activity if already in home stack

Change-Id: I24ecbcac6cee4ddbd90cdd27c4f4915cffb9b354

9 years ago[Renderscript] Add check for Allocation.copyTo(Array) and
Miao Wang [Thu, 15 Jan 2015 19:09:23 +0000 (11:09 -0800)]
[Renderscript] Add check for Allocation.copyTo(Array) and
Fix the input allocation type check for Histogram Intrinsic.

Bug: 19035242
Change-Id: I0ef2672bf816854db90fc92dc9ef51d1d231c246

9 years agoClarify getTrustAgentConfiguration() documentation.
Jim Miller [Thu, 15 Jan 2015 02:17:19 +0000 (18:17 -0800)]
Clarify getTrustAgentConfiguration() documentation.

Fixes bug 18983802

Change-Id: I2f6e208cdd4fac95d1d0228bec3de8199baafa57

9 years agoShow connect dialog when selecting secure QS wifi
Jason Monk [Wed, 14 Jan 2015 15:13:22 +0000 (10:13 -0500)]
Show connect dialog when selecting secure QS wifi

Use startSettingsActivity (QSTileHost) to make sure we use the right flags
and get the keyguard out of the way so the user always sees the
connect dialog for secure networks when they are sent to settings.

Bug: 18987307
Change-Id: I9027393ab8743e6dfe702221cb3bc1bb4e213708

9 years agoAvoid ripple buffer creation for empty bounds
Alan Viverette [Wed, 21 Jan 2015 20:30:49 +0000 (12:30 -0800)]
Avoid ripple buffer creation for empty bounds

Bug: 19068439
Change-Id: I031d4303bbf101a25612dce6f02d81ce4cf58e2b

9 years agoMerge "docs: WebView security notes for apps on pre-K devices" into lmp-docs
Andrew Solovay [Wed, 21 Jan 2015 19:20:57 +0000 (19:20 +0000)]
Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs

9 years agoMerge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev
Dianne Hackborn [Wed, 21 Jan 2015 18:41:37 +0000 (18:41 +0000)]
Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev

9 years agoAlertActivity now behaves as a dialog for accessibility purposes.
Svetoslav [Fri, 16 Jan 2015 23:42:58 +0000 (15:42 -0800)]
AlertActivity now behaves as a dialog for accessibility purposes.

AlertActivity is intended to look like a dialog but for accessibility
purposes it was populated as an activity. As a result the content of
the "dialog" was not properly announced to the user.

bug:18865632

Change-Id: I27166fc74678981f4f3ad71d6d25727b5110340c

9 years agoWork on issue #18201239: ANRs in com.google.process.gapps:
Dianne Hackborn [Wed, 21 Jan 2015 17:55:13 +0000 (09:55 -0800)]
Work on issue #18201239: ANRs in com.google.process.gapps:

Reason: Executing service com.google.android.syncadapters.contacts
/.SyncHighResPhotoIntentService

Make the code more robust when destroying services, so that if
the nesting count gets out of sync we don't just hang.

Change-Id: If117d5ef242e7c148fd9576bd89a1a092583d6ad

9 years agoNever set "Work" or "Personal apps" as prefered activities.
Nicolas Prevot [Wed, 21 Jan 2015 17:50:23 +0000 (17:50 +0000)]
Never set "Work" or "Personal apps" as prefered activities.

In ResolverActivity: when the user chooses work or personal:
Do not set them as prefered activities.

BUG:19091836

Change-Id: Ibe0081eb16e58cc25decb3f25b7fd50b5403d5fc

9 years agoMerge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with...
Luan Nguyen [Wed, 21 Jan 2015 16:19:18 +0000 (16:19 +0000)]
Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs

9 years agoMerge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev
Kenny Guy [Wed, 21 Jan 2015 16:13:21 +0000 (16:13 +0000)]
Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev

9 years agodocs: Fix conditional in ambient mode check method (18832168).
Luan Nguyen [Tue, 20 Jan 2015 16:41:51 +0000 (08:41 -0800)]
docs: Fix conditional in ambient mode check method (18832168).
Fix issue with non existent variable (18832287).
Fix issue with outdated instructions (18832293).
Fix issue with misleading time tick (18832171).

bug: 18832168
bug: 18832171
bug: 18832287
bug: 18832293
Change-Id: I4f071846589ba7edda500342ccd5fac6ecca3161

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Jan 2015 14:15:11 +0000 (08:15 -0600)]
Import translations. DO NOT MERGE

Change-Id: I3d03c8e758bc8ecfe8e8b789fcfeab386e7eec9a
Auto-generated-cl: translation import

9 years agoLog interface name and uid when filtering a blocked network.
Erik Kline [Mon, 19 Jan 2015 07:19:09 +0000 (16:19 +0900)]
Log interface name and uid when filtering a blocked network.

Bug: 18707263
Change-Id: Ide9a1670a97eae787b785933de0c80750c2b5601

9 years agoMerge "CEC: Switch active input after routing control" into lmp-mr1-dev
Jinsuk Kim [Wed, 21 Jan 2015 02:10:53 +0000 (02:10 +0000)]
Merge "CEC: Switch active input after routing control" into lmp-mr1-dev

9 years agoCEC: Switch active input after routing control
Jinsuk Kim [Wed, 21 Jan 2015 00:32:30 +0000 (09:32 +0900)]
CEC: Switch active input after routing control

Makes sure the previous HDMI input gets switched to upon receiving
<Inactive Source> from the current active source device.

Bug: 18986597
Change-Id: I7120e81d75b5fd4cafd4b483e9b232b96e50f597

9 years agoCheck in "current" system API files.
Ying Wang [Fri, 9 Jan 2015 19:51:26 +0000 (11:51 -0800)]
Check in "current" system API files.

The API files were generated by running "make showcommands update-system-api".

Bug: 18960664
Change-Id: Ibb4756d98be3cbf67f6103f5d5d8ff060b3c34c9

9 years agoMerge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering...
Dianne Hackborn [Wed, 21 Jan 2015 00:23:52 +0000 (00:23 +0000)]
Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev

9 years agodocs: WebView security notes for apps on pre-K devices
Andrew Solovay [Tue, 20 Jan 2015 23:47:31 +0000 (15:47 -0800)]
docs: WebView security notes for apps on pre-K devices

Added paragraph describing security precautions for apps that use
WebView on devices running versions older than Android 4.4. See first
comment for doc stage location.

bug: 19075466
Change-Id: I69937d8dfc37ec1ba693f969500b9dc7404c4635

9 years agoMerge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev
Craig Mautner [Tue, 20 Jan 2015 23:07:55 +0000 (23:07 +0000)]
Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev

9 years agoMerge "More debugging for bug 17721767" into lmp-mr1-dev
Craig Mautner [Tue, 20 Jan 2015 22:57:41 +0000 (22:57 +0000)]
Merge "More debugging for bug 17721767" into lmp-mr1-dev

9 years agoFix issue #19020826: Including timing issues in ANR reason breaks clustering
Dianne Hackborn [Tue, 20 Jan 2015 21:43:32 +0000 (13:43 -0800)]
Fix issue #19020826: Including timing issues in ANR reason breaks clustering

Also improve service ANR debugging.

Change-Id: I2118ef2811ca3ba676c110639f58d5c21abfb8eb

9 years agoMerge "Don't launch broadcast receiver processes during boot" into lmp-mr1-dev
Christopher Tate [Tue, 20 Jan 2015 22:54:57 +0000 (22:54 +0000)]
Merge "Don't launch broadcast receiver processes during boot" into lmp-mr1-dev

9 years agoMerge "Don't try to launch broadcast receivers during boot" into lmp-mr1-dev
Christopher Tate [Tue, 20 Jan 2015 22:54:53 +0000 (22:54 +0000)]
Merge "Don't try to launch broadcast receivers during boot" into lmp-mr1-dev

9 years agoMerge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev
Sanket Padawe [Tue, 20 Jan 2015 22:50:02 +0000 (22:50 +0000)]
Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev

9 years agoFixed a crash in TelephonyManager while calling getDeviceID()
Sanket Padawe [Tue, 20 Jan 2015 22:40:14 +0000 (14:40 -0800)]
Fixed a crash in TelephonyManager while calling getDeviceID()

Bug: 19056848
Change-Id: Ie241b25be212910a177c3ee5b620d646cfdd482f

9 years agoMerge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev
Jinsuk Kim [Tue, 20 Jan 2015 22:39:52 +0000 (22:39 +0000)]
Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev

9 years agoRevert "Remove debugging and skip InputMethod windows"
Craig Mautner [Tue, 20 Jan 2015 22:35:25 +0000 (22:35 +0000)]
Revert "Remove debugging and skip InputMethod windows"

This reverts commit 668cae1d4724cf794571f1ee2a3e896984b97db7.

Too soon. I need this for debug.

Change-Id: Ibeaec0139f511cf389049bdb7dae368a7bd8186b