Rich Slogar
138ab38141
am e12c404a: am 35d7cd40: am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs
...
* commit 'e12c404a07037d214c7f1f83d993ce9dba95e47b':
docs: providing resources link
2015-05-06 01:13:28 +00:00
Nicolas Prevot
95778ffc58
Fetch DISALLOW_CONFIG_VPN for the current user.
...
The code did not specify the user in which to fetch the value
of the restriction DISALLOW_CONFIG_VPN. Since it was called
from the vpn service which lives in user 0, it would always fetch
the value for user 0.
BUG: 18902920
Change-Id: I89419976a8edcaa86ac8e545c64d10818cd42ddd
2015-05-06 02:10:07 +01:00
Jason Sams
d1516dffa8
Fix Allocation-less launches
...
Cherry-pick fix from AOSP. Error check for kernel launch was
generating a false positive.
bug 20690242
Change-Id: Ic4c6644072a11aab9a273070be5734519136f685
2015-05-05 18:00:34 -07:00
Rich Slogar
84a67c7db7
am 1b5f692d: am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs
...
* commit '1b5f692d853cf5e873dbe4eb93c34e3fcdbb02ed':
docs: gradle multidex update
2015-05-06 01:00:16 +00:00
Rich Slogar
f0ea8f9f1e
am f77d64dc: am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs
...
* commit 'f77d64dca71e9a11de3f234ce686692dae9d92ed':
docs: overview link to release notes
2015-05-06 01:00:12 +00:00
Rich Slogar
7e33aa4843
am 96d00bb6: am 37ca7773: Merge "docs: translation editor update" into lmp-docs
...
* commit '96d00bb64c8dc9fb85f1f2ecb894930d3eacd0d5':
docs: translation editor update
2015-05-06 01:00:08 +00:00
Rich Slogar
ffef3b7676
am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs
...
* commit '39b51b4968c0aeeef84d5d75ef683516e658a30d':
docs: memory monitor duplicate paragraph
2015-05-06 01:00:04 +00:00
Rich Slogar
e12c404a07
am 35d7cd40: am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs
...
* commit '35d7cd40bb167ee08bbb855195eb395e77a05b7a':
docs: providing resources link
2015-05-06 00:58:49 +00:00
Rich Slogar
35d7cd40bb
am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs
...
* commit 'd0551feed28614dad957a09998522b25392ce621':
docs: providing resources link
2015-05-06 00:50:57 +00:00
Rich Slogar
1b5f692d85
am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs
...
* commit '9b4d57e1dc480f375dc26a77333ff4705f760bb8':
docs: gradle multidex update
2015-05-06 00:44:58 +00:00
Rich Slogar
f77d64dca7
am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs
...
* commit '2f14c38ffb5da66ab58551a1ccd273dfb602babf':
docs: overview link to release notes
2015-05-06 00:44:53 +00:00
Rich Slogar
96d00bb64c
am 37ca7773: Merge "docs: translation editor update" into lmp-docs
...
* commit '37ca7773a59cb4a7de4406378f5b1c8d4c5fefd2':
docs: translation editor update
2015-05-06 00:44:48 +00:00
Rich Slogar
39b51b4968
am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs
...
* commit '2febf6e0a5bd9f716005c256f7357c6f44b52c2b':
docs: memory monitor duplicate paragraph
2015-05-06 00:44:42 +00:00
John Spurlock
bc1a2ad878
Merge "Zen: Maintain source filters for both calls and messages." into mnc-dev
2015-05-06 00:30:26 +00:00
Chih-Hung Hsieh
57bbb8d681
Merge "Remove unused aapt target." into mnc-dev
2015-05-06 00:29:24 +00:00
Amith Yamasani
19343927c2
Merge "Permission policies are for profile and device owners" into mnc-dev
2015-05-06 00:18:19 +00:00
Amith Yamasani
6f36d42dcc
Permission policies are for profile and device owners
...
Not just device owners
Change-Id: I78ad815651e9bdc4bd78e61d634a5067935fa33f
2015-05-05 17:16:18 -07:00
Chih-Hung Hsieh
9a59a991dd
Remove unused aapt target.
...
BUG: 20765163
Change-Id: I13f36f76541216c5c1c20ae8866e09038e08e6f8
(cherry picked from AOSP commit 97627314a4d3e114afe3dbd764a51523e9f0b787)
2015-05-06 00:13:37 +00:00
Jean-Luc Brouillet
afa81ed0b1
am 79f12bb6: am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript reference documentation.
...
* commit '79f12bb648aa8a4f71e2c64c5c6354e2261e3257':
docs: Overhaul of the RenderScript reference documentation.
2015-05-05 23:58:55 +00:00
Selim Cinek
6da881ba7d
Merge "Fixed a measuring bug when the panel was collapsed" into mnc-dev
2015-05-05 23:55:00 +00:00
Selim Cinek
1e139e8684
Merge "Enforcing the touchslop now when flinging open before intercepting" into mnc-dev
2015-05-05 23:54:22 +00:00
Selim Cinek
1690ec8e72
Merge "Fixed a bug where the notifications would jump when going to the full shade" into mnc-dev
2015-05-05 23:54:04 +00:00
Selim Cinek
e9194b98a2
Merge "Extended test to support launching assist above lock screen" into mnc-dev
2015-05-05 23:53:23 +00:00
Selim Cinek
6329bbceeb
Merge "The voice assist may now be launched above the lockscreen" into mnc-dev
2015-05-05 23:52:35 +00:00
Rich Slogar
d0551feed2
Merge "docs: providing resources link" into lmp-mr1-ub-docs
2015-05-05 23:44:34 +00:00
Rich Slogar
9b4d57e1dc
Merge "docs: gradle multidex update" into lmp-docs
2015-05-05 23:42:23 +00:00
Jean-Luc Brouillet
79f12bb648
am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript reference documentation.
...
* commit 'd967fcbee77b2872cb5ae6b05aaabbbc764f806b':
docs: Overhaul of the RenderScript reference documentation.
2015-05-05 23:39:28 +00:00
Rich Slogar
2f14c38ffb
Merge "docs: overview link to release notes" into lmp-docs
2015-05-05 23:38:50 +00:00
Rich Slogar
37ca7773a5
Merge "docs: translation editor update" into lmp-docs
2015-05-05 23:38:18 +00:00
Rich Slogar
2febf6e0a5
Merge "docs: memory monitor duplicate paragraph" into lmp-docs
2015-05-05 23:37:52 +00:00
Yorke Lee
a5d5c1d084
Fix potential NPE in TelecomManager.placeCall
...
Don't pass null parameters
Change-Id: Icf8f4eb3e96a51a5c091322c83ae163e366c21de
2015-05-05 16:36:22 -07:00
Etan Cohen
9c7ce8b0fc
Merge "Disable VT over IMS feature." into mnc-dev
2015-05-05 23:30:30 +00:00
Jean-Luc Brouillet
d967fcbee7
am e9f17cda: docs: Overhaul of the RenderScript reference documentation.
...
* commit 'e9f17cda80ae60818f43b4ed724436c8b88fd0db':
docs: Overhaul of the RenderScript reference documentation.
2015-05-05 23:27:04 +00:00
Jae Seo
915389d4b8
Merge "TIF: Make all the parameters for UNRATED null" into mnc-dev
2015-05-05 23:13:21 +00:00
Jae Seo
936c040ec4
TIF: Make all the parameters for UNRATED null
...
UNRATED is equivalent to Java null in its meaning and usage, thus it is
not appropriate to use non-trivial strings such as "com.android.tv" and
"UNRATED" to create this constant. Replaced them with the string "null",
which is commonly used in other parts of Android and also modified the
documentation to clarify its usage.
Bug: 19102311
Change-Id: I28ac8da3584eb2cc6dfd7284e2b88873fd4e9d13
2015-05-05 15:48:06 -07:00
John Spurlock
a492d1d88c
Zen: Maintain source filters for both calls and messages.
...
Bug: 18635172
Change-Id: Ifeb56f1c8d8a30c4966c628edf7512199f3edb22
2015-05-05 18:45:42 -04:00
Jean-Luc Brouillet
e9f17cda80
docs: Overhaul of the RenderScript reference documentation.
...
cherry-pick from CL: https://android-review.googlesource.com/148241
This CL replaces the Doxygen generated documentation by one that's created
by our internal tool found in framework/rs/api. The big advantages:
- Can handle overloaded functions. Doxygen could not and RenderScript has many.
- Can have version information.
- Can match the look of the Java documentation.
- Cleaner look and no leaking of internal paths.
This CL also include changes introduced by the L release which was missing
previously.
Change-Id: Icade41d04d35e45c445ad952bb8ce14389f9f59f
2015-05-05 15:20:50 -07:00
Etan Cohen
f8904dccf4
Disable VT over IMS feature.
...
Feature code (mostly) implemented but not final or supported in release.
Change-Id: I65c4d4400a814718c51954299ef7c993a37638e2
2015-05-05 15:18:07 -07:00
Jeff Tinker
fc48bf78a2
Clarify wording of MediaCrypto exception "ERROR_NO_KEY"
...
related-to-bug: 20857014
Change-Id: I13204528ec44cda76a721f4d9f6021c1435921ac
2015-05-05 15:04:01 -07:00
Ben Kwa
e74007ded3
Merge "Clean up error handling in CopyService." into mnc-dev
2015-05-05 21:53:22 +00:00
Selim Cinek
81e36fe7c2
Fixed a measuring bug when the panel was collapsed
...
This lead to the dismissView and other views being measured with
height 0 and therefore harm performance and animations.
Bug: 20665047
Change-Id: I985c40948994b409cea5ac7c34a711ce243c62f1
2015-05-05 14:53:09 -07:00
Selim Cinek
173f2d0fad
Enforcing the touchslop now when flinging open before intercepting
...
This could lead to clicks on notifications not being recognized when opening.
Bug: 19228079
Change-Id: I02c856dd885c8e9bb228a5b20e975e27dba60d12
2015-05-05 14:53:09 -07:00
Selim Cinek
8d5727f6e9
Fixed a bug where the notifications would jump when going to the full shade
...
Change-Id: I811f3cd543f0e69d06bfe692435c579b7844173e
2015-05-05 14:53:08 -07:00
Selim Cinek
704b9f82c3
Extended test to support launching assist above lock screen
...
Change-Id: Ic65e638eed214a240cc13666f857e9b297f28168
2015-05-05 14:53:08 -07:00
Selim Cinek
e70d653523
The voice assist may now be launched above the lockscreen
...
A possibility was introduced to launch voice assist over
the lockscreen using the left keyguard affordance.
Change-Id: Ic4618d24256b65441a50d77d0ef59b0ec99b6ead
2015-05-05 14:52:52 -07:00
Jorim Jaggi
570de1e0e9
Make sure fingerprint error messages are handled in Keyguard
...
Change-Id: I332c08c5e94cf58a2d3f696860511c1a84fecda5
2015-05-05 21:44:11 +00:00
Chris Craik
356b177709
Merge "Cleanup properties" into mnc-dev
2015-05-05 21:30:08 +00:00
John Reck
d6abbd29b7
Merge "Dump profile info after running test" into mnc-dev
2015-05-05 21:15:27 +00:00
Alan Viverette
b9da280ac2
DayNight theme for framework packages
...
Change-Id: I745f90561c957c83540e75a2886e294633c83be1
2015-05-05 14:09:21 -07:00
Pavel Zhamaitsiak
b2e3b74418
Merge "WiFi Calling: Show different operator name string in Data usage dialog." into mnc-dev
2015-05-05 21:05:49 +00:00