195589 Commits

Author SHA1 Message Date
Selim Gurun
36cf701e1e Clarify handling client certificates
Bug: 21910771

Clarify handling client certificates when using a webview. This is a
documentation change only.

Change-Id: Ifcd7c2c9fffc79c1dcc162d829dfbb175cddaa11
2015-06-19 11:46:29 -07:00
Adrian Roos
4f43dc042b Assist disclosure
Add an animation that discloses delivery
of contextual data to the assist component.

Also fixes a bug where contextual data was
delivered to legacy assist activities even
though the user explicitly disabled context.

Bug: 21568059
Change-Id: I27dfaa36e2f677b0d73acfa4730f0f4ea3486919
2015-06-19 11:33:05 -07:00
Jason Monk
cdca13c613 Merge "Fix intent tile to unlock on launching activities" into mnc-dev 2015-06-19 18:29:00 +00:00
Abodunrinwa Toki
6983752a10 Merge "Better FloatingToolbar positioning." into mnc-dev 2015-06-19 18:28:20 +00:00
David Srbecky
f32f7a3ffd Merge "Replace --include-cfi with --generate-debug-info." into mnc-dev 2015-06-19 18:26:42 +00:00
Jason Monk
ee43cdfa43 Fix intent tile to unlock on launching activities
Change-Id: Ibde6a21d5a36d4697101e2201d1d77e26d684753
2015-06-19 14:26:25 -04:00
Oleksiy Vyalov
71f9ec2708 Merge "Resolve canonical package path before writing it to packages.list." into mnc-dev 2015-06-19 18:25:12 +00:00
Alan Viverette
7c669f4547 Merge "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" into mnc-dev 2015-06-19 18:20:21 +00:00
Alan Viverette
9355533bf6 Revert "Work around inconsistent views in RelativeLayout.onMeasure()"
This reverts commit 3e2e064a1f989228f48e8faf588393a1a5ee1e31.

Change-Id: Ib3712076585cba507ef1666e3fb6abb2bedb016f
2015-06-19 18:19:56 +00:00
Christopher Tate
7ad40c5032 Merge "Debug logging for a certain class of binder transaction failures" into mnc-dev 2015-06-19 18:19:15 +00:00
Christopher Tate
8a2ce3c751 Debug logging for a certain class of binder transaction failures
Bug 21801759

Change-Id: I9973d4ffb9450e510a4e1c64e2eae1489ce93054
2015-06-19 11:17:24 -07:00
Abodunrinwa Toki
9ae95dff1d Better FloatingToolbar positioning.
-The toolbar is now rendered over the IME.
-The toolbar respects the presence of the IME and tries as much as
 possible not to obstruct it.
-The toolbar may obstruct the IME if there is limited space and we
 can't find a position that won't obstruct the IME.

*A side effect of the toolbar over the IME is that TextView handles
 will also always be rendered over the IME where necessary. This was
 the previous behavior before the regression.

Bug: 17510971
Change-Id: I26a49565bf025d7c007ba6bb80468c4988fcc051
2015-06-19 19:15:50 +01:00
Tony Mak
92dfab8d96 Merge "Clear granted permission when app is uninstalled by one of the multiple users" into mnc-dev 2015-06-19 16:57:41 +00:00
Tony Mak
8e33f63040 Clear granted permission when app is uninstalled by one of the multiple users
Bug: 21838358

Change-Id: Iccd46382c9468d0503da0bb49a49040ae712e2cc
2015-06-19 17:52:49 +01:00
Eric Laurent
1f98e79abd Merge "audio effect JNI: fix global ref leak." into mnc-dev 2015-06-19 16:46:30 +00:00
Wale Ogunwale
8f4ccd6c96 Merge "Reduce log noise." into mnc-dev 2015-06-19 16:36:23 +00:00
Wale Ogunwale
4186c977eb Merge "Don't write IntentFilter autoVerify field to xml if false." into mnc-dev 2015-06-19 16:36:00 +00:00
Zhijun He
33e07bd730 Merge "Camera2: add FACE_PRIORITY_LOW_LIGHT" into mnc-dev 2015-06-19 16:23:42 +00:00
Zhijun He
ee2ebdedcc Camera2: add FACE_PRIORITY_LOW_LIGHT
Add FACE_PRIORITY_LOW_LIGHT to allow higher sensitivity value AE under low
light.

Also fix some minor doc issue for high speed recording capability.

Bug: 21813977
Change-Id: I965ece936c1bc3d3cb370454e950fde4aad06335
2015-06-19 09:13:37 -07:00
Eric Laurent
077999844f audio effect JNI: fix global ref leak.
Remove one more global ref leak in AudioEffect
and Visualizer JNI.

Bug: 21629892.
Change-Id: Id77fc2d10f3dc9d3154d6a1cf0f8cc0f83683584
2015-06-19 09:13:02 -07:00
Jeff Tinker
969a06475c Merge "Improve robustness of MediaDrm after mediaserver crash" into mnc-dev 2015-06-19 16:05:13 +00:00
Wale Ogunwale
15b9fd268a Don't write IntentFilter autoVerify field to xml if false.
Bug: 21205789
Change-Id: I650265eeec99d470ae2f089d8ae3ef3c866c0096
2015-06-19 08:59:52 -07:00
Jason Monk
1247e48e02 Merge "Fix security whole in lock task" into mnc-dev 2015-06-19 15:32:06 +00:00
Jason Monk
25d237b8ea Fix security whole in lock task
When flags NEW_TASK and CLEAR_TASK are set, the task gets reused
which causes the lock task to be ignored.  Add a special check
for this to be a lock task violation.

Bug: 20893212
Change-Id: Ibf3c71f40e197f0830410eb4e20429e901998378
2015-06-19 11:15:38 -04:00
Chris Wren
7e786954e5 Merge "drop corrupt notifications in the Listener" into mnc-dev 2015-06-19 15:15:22 +00:00
Shawn Willden
df0b80e4e1 Merge "Add new error codes for rate-limit and max-use failures." into mnc-dev 2015-06-19 15:13:22 +00:00
Shawn Willden
91526c1430 Add new error codes for rate-limit and max-use failures.
Bug: 21607106
Change-Id: Ia0527341f98726bf74c2bfddd9b9a82974fab954
2015-06-19 09:07:13 -06:00
Wale Ogunwale
08741e96ab Reduce log noise.
Bug: 21941219
Change-Id: Ic84719cf1b901c7e6befeca5c73685301e511db8
2015-06-19 08:05:24 -07:00
seunghyun85.lee
77963292a1 Apply the scale to surfaceinsets when computing crop region
While in computing surface crop region, magnification specs are
not applied to surface insets from LayoutParams.

So, in case magnification specs are set,
surface crop region should be calculated considering scale factor.

(For instance, using TouchZoom in Accessibility
at AppsPermissionActivity in market app)

Bug: 20863078
Change-Id: I9e7e21e502b29208f2856918d6fcda050f515595
Signed-off-by: Seunghyun Lee <seunghyun85.lee@lge.com>
2015-06-19 07:59:19 -07:00
Kenny Guy
43cf8d1ed1 Merge "Use closer to standard toast for work profile toast." into mnc-dev 2015-06-19 14:56:51 +00:00
Jason Monk
660130b9b0 Merge "Try to keep connection state more up to date" into mnc-dev 2015-06-19 14:55:38 +00:00
Kenny Guy
63bf8acb2a Use closer to standard toast for work profile toast.
Revert back to using a standard system toast
for the toast shown when user unlocks to a
work activity.
Include the work status icon in the toast.

Bug: 21325183
Bug: 21896447
Change-Id: I691417a4ecac36983f391ee722f59e2b467affc1
2015-06-19 15:34:02 +01:00
Abodunrinwa Toki
07e440b278 Merge "Fix FloatingToolbar flickers." into mnc-dev 2015-06-19 14:26:11 +00:00
Jason Monk
909705601e Try to keep connection state more up to date
It seems that connection state isn't always correct, make sure we
update it every time a device changes state, so that we don't stay
connected while no device is connected.

Bug: 21896051
Change-Id: I5aa398f33a916609742e22ce5affd4211ed0a626
2015-06-19 10:04:49 -04:00
Gustav Sennton
1b48a6430a Merge "Revert "Load WebView from one out of a list of packages."" into mnc-dev 2015-06-19 13:23:52 +00:00
Gustav Sennton
d973018221 Revert "Load WebView from one out of a list of packages."
This was not a clean revert!

This reverts commit 2ed6fee15c85ff991f64ecfa8c1c4738e0fdf9b6.
We essentially only revert the functionality for going through a list of
WebView package names and picking the first compatible one.
Except for that functionality we also fetched the name of the shared
library from a flag in WebView and made some minor refactoring in the
initial commit, these changes have been left alone in this revert.

Bug: 21893371
Change-Id: Idb2539dc33cc5f9e2894ecd665c23573c6cba9f3
2015-06-19 11:38:56 +01:00
Andrei Stingaceanu
50057943fb Merge "Cannot select text after rotation in extract mode" into mnc-dev 2015-06-19 09:33:04 +00:00
Sudheer Shanka
a408061cc7 Merge "Use the intent filter icon in ResolveInfo for managed profile." into mnc-dev 2015-06-19 09:25:59 +00:00
Jonathan Basseri
cb8bb39001 Merge "Add VVM carrier config to public API." into mnc-dev 2015-06-19 06:16:48 +00:00
Rich Slogar
e9abb6829f am d9d05fe3: am 838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs
* commit 'd9d05fe358c96e85149627d955191d1328e9924a':
  docs: sdk-tools 24.3.3 updates
2015-06-19 05:58:13 +00:00
Wei Liu
940335ba5b Merge "resolved conflicts for merge of 1dac6bd9 to mnc-dev" into mnc-dev 2015-06-19 05:54:54 +00:00
Wei Liu
9fbee9ba98 resolved conflicts for merge of 1dac6bd9 to mnc-dev
Change-Id: I000b35f5e2658a065c780396254bcb88f1cbce5e
2015-06-18 22:52:37 -07:00
Shawn Willden
0961480879 Merge "Reflect removal of KM_TAG_AEAD_TAG from keymaster." into mnc-dev 2015-06-19 03:16:55 +00:00
Oleksiy Vyalov
466ecdbc1e Resolve canonical package path before writing it to packages.list.
Bug id - b/21028929

Change-Id: I82a7ba4f27017d3de29790cdbfab656ca9814cfb
(cherry picked from commit 4b42adf697c0ecde7ed18234109eb5430239fe54)
2015-06-18 20:08:37 -07:00
Alex Klyubin
42abb74834 Reflect removal of KM_TAG_AEAD_TAG from keymaster.
This reflects the changes in da89dde9787dfbd8c053119ab52d9e671106b18e
in system/keymaster.

Bug: 19919114
Change-Id: I9cdfc7ce63099c4de29029b1fc112369c4a68eba
2015-06-18 18:43:45 -07:00
Selim Cinek
a353528c79 Merge "Added a message to the keyguard bouncer" into mnc-dev 2015-06-19 01:40:39 +00:00
Adam Lesinski
8b156e37d5 Merge "BatteryStats: Update external stats individually." into mnc-dev 2015-06-19 01:22:53 +00:00
David Srbecky
065075e1f9 Replace --include-cfi with --generate-debug-info.
This follows a change in dex2oat.

(cherry picked from commit f39477b592e6e17fe41ace2e18602a69b2dd1619)

Bug: 21924613
Change-Id: I46b61298ca00bee2e83080456b180d63efd95b8f
2015-06-19 02:20:06 +01:00
Adam Lesinski
d2b9dcac7f Merge "BatteryStats: Log when WiFi idle time is too large" into mnc-dev 2015-06-19 01:17:08 +00:00
Adam Lesinski
a7c90c84e4 BatteryStats: Update external stats individually.
When wifi traffic causes a stats collection, we shouldn't care about
cpu or bluetooth updates.

Bug:21478443
Change-Id: I177dc0fc09951813cb4a702ad0e5d951d69f8c22
2015-06-18 18:13:36 -07:00