197028 Commits

Author SHA1 Message Date
Jason Monk
33b60bb45f Fix demo mode issues
Bug: 22387423
Change-Id: I7b0b4ca75bae12a9fb3a90ab804b263e8d982b46
2015-07-13 10:42:23 -04:00
Esteban Talavera
0ec43f89d2 Merge "Use correct user when filtering app link candidates" into mnc-dev 2015-07-13 09:48:48 +00:00
Esteban Talavera
2292160320 Merge "Don't send app links to parent profile if status == never" into mnc-dev 2015-07-13 09:48:21 +00:00
Billy Lau
96d00ab359 Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev 2015-07-12 22:02:37 +00:00
Billy Lau
22b3f4cb15 Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
Raised the protection level of WRITE_SETTINGS permission to appop and also
allowed backwards compatibility with pre23 flag. Also made sure that this
permission is not added as RuntimePermission in DefaultPermissionGrantPolicy as
that breaks a lot of gmscore stuff.

Introduced new action to manage write system settings as a new API and
renamed the string that describes the managing of overlay permission.

Change-Id: Ifd25a6ddc06de68ee37015cb9fb23452e4ef10f4
2015-07-12 22:41:00 +01:00
Zhijun He
4fb81253ed Camera metadata: fix typos.
Bug: 22417740
Change-Id: I871b990da43132f4967faf7ee23a9a2d962c4320
2015-07-11 20:03:52 -07:00
Geoff Mendal
1962ad3e09 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-11 19:01:51 +00:00
Geoff Mendal
27963efe42 Import translations. DO NOT MERGE
Change-Id: I59264674ef40a0f68a80c0ca9973e3aba2c06db1
Auto-generated-cl: translation import
2015-07-11 10:35:45 -07:00
Geoff Mendal
d64ba82e89 Import translations. DO NOT MERGE
Change-Id: I69aef7f3e9d819732675c4103553a6afe4b062b3
Auto-generated-cl: translation import
2015-07-11 06:47:43 -07:00
Raph Levien
1b3d03512e Merge "Improve Html.toHtml() documentation" into mnc-dev 2015-07-11 06:09:12 +00:00
Amith Yamasani
292eb65f1e Merge "Fix new user creation regression due to vold remount calls" into mnc-dev 2015-07-11 02:28:01 +00:00
Amith Yamasani
5449ee0786 Merge "Avoid IPC call with an empty array" into mnc-dev 2015-07-11 02:27:33 +00:00
Sanket Padawe
233bd3ceff Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev 2015-07-11 01:46:33 +00:00
Adrian Roos
d374c20fc9 Merge "Fix flash of uninitialized surface" into mnc-dev 2015-07-11 00:57:20 +00:00
Raph Levien
c55277d689 Improve Html.toHtml() documentation
The existing documentation is very terse and users were getting
confused whether the method escapes HTML metacharacters or not. Expand
the description a bit and explicitly state that metacharacters are
escaped.

Bug: 17456925

Change-Id: Icaae7fe1344629de5c0860674f3913781de18013
2015-07-10 17:44:18 -07:00
Carlos Valdivia
97cf0f1d76 Merge "Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""" into mnc-dev 2015-07-11 00:40:09 +00:00
Mady Mellor
1c277ca8cd Merge "Fix: line slop shouldn't always increase / decrease by one line" into mnc-dev 2015-07-11 00:30:33 +00:00
Mady Mellor
a9f07ccf38 Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev 2015-07-11 00:26:35 +00:00
Mady Mellor
a6a0f7829f Fix line slop issue at end of line for Thai & CJK
Previously touch slop for line movement was based on the line position
of the HandleView, not the previous line touched.

Thai and CJK languages don't have a space at the end of a line so
the handle jumps to the beginning of the next line. This meant that
when calculating the touch slop it'd be from the incorrect line.

This CL tracks the previous line touched and uses that instead to
calculate touch slop and applies it to the selection and insertion
handles.

Note this is *not* added to the drag accelerator because
it does not have the problem of the handle jumping to the next line
since it has no handles.

Bug: 21925162
Change-Id: If4b231725c06489ec780a5b5a308ceffee804c20
2015-07-10 16:43:32 -07:00
Wale Ogunwale
26b0f1e420 Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev 2015-07-10 22:53:14 +00:00
Adrian Roos
18a0b9e041 Fix flash of uninitialized surface
Fixes a bug where during the animation of
the backdrop uninitialized memory was showing
because the backdrop's alpha was zero, so RenderNode
didn't issue any drawing commands.

Bug: 21472158
Change-Id: I7ad6bb64e739059febffca10463c8097693a9563
2015-07-10 15:50:24 -07:00
John Reck
8657d9e8a5 Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev 2015-07-10 22:46:18 +00:00
Chris Craik
9f00492008 Merge "Reduce cost of span type checking" into mnc-dev 2015-07-10 22:44:28 +00:00
Wale Ogunwale
12bb956828 Revert "Finish already paused activity if it should be finished after pausing"
This reverts commit bef8a3e39372ca85104b894f7359deddc97a8fec.

Changed caused some existing apps to crash. Reverting to unblock the
build while I investigate.

Bug: 22170595
Bug: 22397812
2015-07-10 15:25:38 -07:00
Carlos Valdivia
a3db8acf3d Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
Fixes api stuff.

This reverts commit f2d248db8078e716b809e0a17cacdea5c5609bd5.

Change-Id: I75c05a17ebde4f245e1f3e0cc22e622d06534c4b
2015-07-10 14:47:07 -07:00
Robin Lee
6795a2aeaf Check legacy VPN is connected before alerting
Legacy VPN does nothing if the device has no underlying network
connection, so showing this warning in that case is confusing.

Conversely third-party VPN can still be dangerous since a malicious
app will store sensitive information and upload it later.

Bug: 21499103
Change-Id: I25a0d4e1e5b10198cb067f06645f0e5ecf81bf56
2015-07-10 21:22:46 +00:00
Jorim Jaggi
0c758805b3 Merge "Fix empty keyguard for once and all" into mnc-dev 2015-07-10 21:16:26 +00:00
Jinsuk Kim
256642aa2f Merge "CEC: Do not switch language if the new one is same as the old one" into mnc-dev 2015-07-10 21:09:14 +00:00
Jorim Jaggi
4474f54f4e Fix empty keyguard for once and all
When a Keyguard exit animation was played while the screen was
turning off, the window animation was cancelled. However, since
we didn't reset mPostKeyguardExitAnimation, we thought we need to
apply it again, with a start time of Long.MIN_VALUE. For some reason,
this animation never ended, and it was stuck at the beginning. Thus,
the alpha was 0 and the user just saw a blank wallpaper.

In addition, we also forbid starting the Keyguard exit animation when
the screen is about to turn off.

Bug: 21124013
Change-Id: Ief022c5bd758a9fedcaab3fe9fc385fa4234b37f
2015-07-10 21:06:44 +00:00
Chris Craik
fc121c2430 Reduce cost of span type checking
bug:22378829

Change-Id: I1da5154b2fb4f5032eaed44586d5470d28ceb45b
2015-07-10 13:12:35 -07:00
David Friedman
c1541571ff am 1c231da0: am 48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
* commit '1c231da06c9e9f82c52d36211a865703a5d0cd62':
  Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
2015-07-10 20:11:46 +00:00
David Friedman
1c231da06c am 48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
* commit '48143e6ab960860a87171563d8a7535b41762ffa':
  Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
2015-07-10 19:55:22 +00:00
David Friedman
48143e6ab9 Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
Fixes broken anchors in yellow banner on English version. Adds the banner
to non-English version pages. Adjusted wording for a Known Issue on the
"Support and Release Notes" page.

Change-Id: Ia1db8db34cec854bcc4ad7daa1ad44fa23fc878e
2015-07-10 12:39:41 -07:00
Robin Lee
f180fe31de Merge "Legacy VPN calls to require a userID" into mnc-dev 2015-07-10 19:05:38 +00:00
Raph Levien
5d1654a943 Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev 2015-07-10 18:37:49 +00:00
Robert Greenwalt
1570b6b3c7 Merge "Enable EMERGENCY mobile connections." into mnc-dev 2015-07-10 18:23:24 +00:00
Robert Greenwalt
1ebcb6f8b2 Merge "Fix permissions." into mnc-dev 2015-07-10 18:21:48 +00:00
John Reck
c6024cdd35 JNI optimization tweaks to Paint high-frequency methods
Bug: 22378829

Use fast-jni for getFontMetrics, drops from 35us -> 30us
Note the "heavy" part of the method, getMetricsInternal, is
already called by other fast-jni methods.

Use critical array access for getRunAdvance_* methods. This
will avoid the copy and the access is appropriately scoped
and fast enough to not significantly block the moving GC.
Improves from 88us -> 79us on short text

Change-Id: I7c1481c23f6dba3420fbcf48220f6335cf9f6d10
2015-07-10 10:58:46 -07:00
Chris Banes
77cae7869d am 98b1f102: am c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs
* commit '98b1f1025c606f955ab9afc3872a435a770e3813':
  Support Library v22.2.0 API diff
2015-07-10 17:54:40 +00:00
Sanket Padawe
194cce695b Changes security for Passpoint to EAP security from "Passpoint".
Bug: 22402754
Change-Id: I3afbb6f3f446657a3e9505122032f4edc6401302
2015-07-10 10:53:31 -07:00
John Reck
2c7ed6e80a Merge "Improve ImageView drawable re-use" into mnc-dev 2015-07-10 17:50:28 +00:00
John Reck
525ac80d2d Merge "Create a thread_local cache for textLocale" into mnc-dev 2015-07-10 17:50:12 +00:00
David Friedman
a2c2cc422c am 3f831568: am 6fb22b4e: Docs: Revisions to top DAC landing page and several Preview-page revisions.
* commit '3f83156867fba70db9f2a03f2f0192d8f3b4688e':
  Docs: Revisions to top DAC landing page and several Preview-page revisions.
2015-07-10 17:43:32 +00:00
Chris Banes
98b1f1025c am c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs
* commit 'c2b0d1d42cf6ba2e77fdf31982b3436eeb95b89c':
  Support Library v22.2.0 API diff
2015-07-10 17:39:34 +00:00
John Reck
476f715822 Create a thread_local cache for textLocale
Bug:22378829

toLanguageTag is significantly more expensive than previously
thought (note ULOC_FULLNAME_CAPACITY is 157) and weighs
in at around 40us. Given that this is called on every Paint
and that there are typically thousands of Paint objects
created this adds up very quickly.

Given that the locale is almost always Locale.getDefault(),
a very simple thread_local cache of size 1 fixes this trivially

Change-Id: I819e60cac7a4b27e9dd5538332c22ce5bbd0851c
2015-07-10 10:08:31 -07:00
John Reck
5a1356916d Improve ImageView drawable re-use
Bug 22403868

Initial attempt only helped if setImageBitmap() was the only
thing called but during new-loading content it's common for a
placeholder to be set via setImageDrawable.

Tweak ImageView slightly to just have a BitmapDrawable that it
lazy-creates but will hold on to for any subsequent calls
to setImageBitmap

Change-Id: I7380521c7b363d458e4cda041f1f8b2b1fb3a93a
2015-07-10 10:08:01 -07:00
Roshan Pius
1cb0de17a9 Merge "Correct the comparison done in removeAdapter." into mnc-dev 2015-07-10 16:54:43 +00:00
Robert Greenwalt
9bc8299ca0 Fix permissions.
Legacy API should not need new permissions.
Also found some more hidden/system that should have permissions.

bug:22379438
bug:19257083
Change-Id: I24be0a90dffcffe03d25982a9b02eedcf03fbd59
2015-07-10 09:42:08 -07:00
Paul Jensen
3b9ce37b51 Fix build break.
Automatic merge commit caused breakage due to someone else's
intervening change adding a call site of a function whose last
parameter I removed.  Function in question is
ConnectivityService.rematchAllNetworksAndRequests.
Changes that merged badly are 85cf78e and 8d48252.

Change-Id: I8fd32e1a187236a65c1b7c0ecdf17b817d108fd0
2015-07-10 12:29:23 -04:00
Paul Jensen
bbce221eec Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev 2015-07-10 15:51:38 +00:00