OSDN Git Service
Rubin Xu [Mon, 15 Feb 2016 14:44:44 +0000 (14:44 +0000)]
Initialize mTiles before constructing AutoTileManager
Bug:
22682394
Change-Id: Ida41d3757b0732a01e9ede92ec8c5d2f8426c6b0
Rubin Xu [Mon, 15 Feb 2016 14:29:59 +0000 (14:29 +0000)]
Merge "Fix typo in filling ACTION_MANAGED_PROFILE_UNLOCKED extras." into nyc-dev
Rubin Xu [Mon, 15 Feb 2016 13:50:18 +0000 (13:50 +0000)]
Fix typo in filling ACTION_MANAGED_PROFILE_UNLOCKED extras.
Change-Id: Ic949a0d7f72d46d7cc36018b4b0fc54024c3b180
Paul Crowley [Mon, 15 Feb 2016 14:04:04 +0000 (14:04 +0000)]
Merge "Send extra argument to unlock_user_keys on non-FBE startup" into nyc-dev
Geoff Mendal [Mon, 15 Feb 2016 13:26:51 +0000 (08:26 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ie2f607c102f9345c68edc8eaca3eb6a73f622f5d
Auto-generated-cl: translation import
Neil Fuller [Mon, 15 Feb 2016 12:05:44 +0000 (12:05 +0000)]
Add flags needed to switch Jack to 1.8 for CTS targets
When linking against .jack files that contain 1.8 language
features Jack (currently) requires -D jack.java.source.version=1.8.
"core-tests" includes 1.8 language features.
Bug:
27113322
Bug:
26953739
Change-Id: Ib9ceaadafc9c1d41ff137c48111ad3b060f7e248
Narayan Kamath [Mon, 15 Feb 2016 11:38:33 +0000 (11:38 +0000)]
Merge "Track libcore change
5731615b4d705b5af63a3126d84b8786862477d." into nyc-dev
Neil Fuller [Mon, 15 Feb 2016 11:16:05 +0000 (11:16 +0000)]
Merge "Add flags needed to switch Jack to 1.8 for CTS targets" into nyc-dev
Narayan Kamath [Mon, 15 Feb 2016 11:07:26 +0000 (11:07 +0000)]
Track libcore change
5731615b4d705b5af63a3126d84b8786862477d.
bug:
26689841
Change-Id: I463543c67cc525583d1fd6f7031a0d38f543d8a2
Nicolas Prévot [Mon, 15 Feb 2016 10:47:40 +0000 (10:47 +0000)]
Merge "Allow privileged apps to set the organization color." into nyc-dev
Bartosz Fabianowski [Mon, 15 Feb 2016 10:02:55 +0000 (10:02 +0000)]
Merge "Remove wifiConfiguration.isVisibleToUser()" into mm-wireless-dev
am:
e1bdbd216f
* commit '
e1bdbd216fef6d1f0bb6b3c61cc95abba3e67af7':
Remove wifiConfiguration.isVisibleToUser()
Bartosz Fabianowski [Mon, 15 Feb 2016 09:56:52 +0000 (09:56 +0000)]
Merge "Remove wifiConfiguration.isVisibleToUser()" into mm-wireless-dev
Paul Crowley [Mon, 15 Feb 2016 06:44:51 +0000 (06:44 +0000)]
Send extra argument to unlock_user_keys on non-FBE startup
Non-FBE startup has a loop which sets up the appropriate lock state
for each user depending on whether FBE is being emulated; this loop
calls unlock_user_keys when emulation is off. I didn't modify this
loop when adding the extra arguemnt to unlock_user_keys.
Bug:
27155768
Change-Id: I825a61552383552eafb88c77c1f30591bdfd077c
Ian Pedowitz [Sun, 14 Feb 2016 23:36:48 +0000 (15:36 -0800)]
Revert "Fix missing observer reply callbacks"
This should not have merged from mnc-dr-dev, the underlying implementation has changed
This reverts commit
dbb75248b19366d76cfdd7d4536d68467e7322c1.
Akshay Thakker [Sun, 14 Feb 2016 22:48:31 +0000 (22:48 +0000)]
Merge "Fix missing observer reply callbacks" into mnc-dr-dev am:
d1811e07d5 am:
a3798d7a92
am:
d6de840957
* commit '
d6de84095735a32e160f5ae9ce93489b0b19eeed':
Fix missing observer reply callbacks
Akshay Thakker [Sun, 14 Feb 2016 22:42:32 +0000 (22:42 +0000)]
Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev am:
ae31e13ae8 am:
eae2b8978f
am:
bc45c5e1a3
* commit '
bc45c5e1a35fb248cd327846e0c68f930b64d653':
Exit getAllValidScorers early if not the primary.
Dan Sandler [Sun, 14 Feb 2016 22:41:30 +0000 (22:41 +0000)]
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm. am:
e79c73d626 am:
4baa901205
am:
c644228110 -s ours
* commit '
c64422811060548ac9f754b12b2ce23ed81b1fe0':
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Akshay Thakker [Sun, 14 Feb 2016 22:37:55 +0000 (22:37 +0000)]
Merge "Fix missing observer reply callbacks" into mnc-dr-dev am:
d1811e07d5
am:
a3798d7a92
* commit '
a3798d7a92ecefe1117b99a2e0f5edce1644f1d0':
Fix missing observer reply callbacks
Akshay Thakker [Sun, 14 Feb 2016 22:36:51 +0000 (22:36 +0000)]
Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev am:
ae31e13ae8
am:
eae2b8978f
* commit '
eae2b8978f8cfdedac9404bf4c653f3f9b51f6dd':
Exit getAllValidScorers early if not the primary.
Dan Sandler [Sun, 14 Feb 2016 22:35:39 +0000 (22:35 +0000)]
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm. am:
e79c73d626
am:
4baa901205
* commit '
4baa9012058c8366d39ed9d07fee0f6da0fd6e71':
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Akshay Thakker [Sun, 14 Feb 2016 22:30:47 +0000 (22:30 +0000)]
Merge "Fix missing observer reply callbacks" into mnc-dr-dev
am:
d1811e07d5
* commit '
d1811e07d5ee751cbdc37a3ff84e2e010ead7adf':
Fix missing observer reply callbacks
Akshay Thakker [Sun, 14 Feb 2016 22:27:20 +0000 (22:27 +0000)]
Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev
am:
ae31e13ae8
* commit '
ae31e13ae8785c627ac781a565fa41bc982cfb99':
Exit getAllValidScorers early if not the primary.
Dan Sandler [Sun, 14 Feb 2016 22:25:09 +0000 (22:25 +0000)]
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
am:
e79c73d626
* commit '
e79c73d6267681dbbc8bd4eccf9a79e3017f6fe9':
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Akshay Thakker [Sun, 14 Feb 2016 22:23:53 +0000 (22:23 +0000)]
Merge "Fix missing observer reply callbacks" into mnc-dr-dev
Akshay Thakker [Sun, 14 Feb 2016 22:17:31 +0000 (22:17 +0000)]
Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev
Chong Zhang [Sat, 13 Feb 2016 18:09:46 +0000 (18:09 +0000)]
Merge "Clearing mDestroying flag when app is made visible again" into nyc-dev
Jeff Tinker [Sat, 13 Feb 2016 08:08:31 +0000 (08:08 +0000)]
Merge "Add mediadrm service" into nyc-dev
Joe Onorato [Sat, 13 Feb 2016 07:49:37 +0000 (07:49 +0000)]
Merge "Fix the text so it's visible with current themes." into nyc-dev
Joe Onorato [Tue, 2 Feb 2016 02:05:46 +0000 (18:05 -0800)]
Fix the text so it's visible with current themes.
Change-Id: Ia3f962a8a46ea05465476961de2d297cf08c75b4
Adam Lesinski [Sat, 13 Feb 2016 07:38:08 +0000 (23:38 -0800)]
AAPT2: Fix source output when error occurs in style
We were serializing the wrong Source when writing to protobuf
Change-Id: Ib65e962ebc1244ddf4af0e5666aaaebe5f7864a8
Adam Lesinski [Sat, 13 Feb 2016 06:28:06 +0000 (06:28 +0000)]
Merge "AAPT2: Introduce notion of 'product' to ResourceTable" into nyc-dev
Adam Lesinski [Sat, 13 Feb 2016 06:18:51 +0000 (22:18 -0800)]
AAPT2: Introduce notion of 'product' to ResourceTable
This allows us to preserve the various product definitions during the compile
phase, and allows us to select the product in the link phase.
This allows compiled files to remain product-independent, so that they do not need
to be recompiled when switching targets.
Bug:
25958912
Change-Id: Iaa7eed25c834b67a39cdc9be43613e8b5ab6cdd7
Jeff Tinker [Fri, 12 Feb 2016 16:58:32 +0000 (08:58 -0800)]
Add mediadrm service
Part of media security hardening
This is an intermediate step toward moving
mediadrm to a new service separate from mediaserver.
This first step allows mediadrmservice to run based
on the system property media.mediadrmservice.enable
so it can be selectively enabled on devices that
support using native_handles for secure buffers.
bug:
22990512
Change-Id: I9af073d8383f25657938d07be90c21c0dc6126b7
Svet Ganov [Thu, 4 Feb 2016 22:27:05 +0000 (14:27 -0800)]
Multi packages per APK - broadcasts
This change introduces the ability to have multiple packages per
APK. The feature is currently restricted to privileged apps and
updates to such apps.
In essence the manifest can have multiple child package declarations.
A child package can declare everything an Android package can except
some tags or attributes that are not applicable and instead inherited
from the parent when needed. For example, the target SDK of the parent
applies to all children.
A child package can be updated only through the parent package.
A package with multiple child packages is installed, uninstalled
atomically - no partial installs where some child packages are not
installed.
This change ensures that we send package broadcasts for child packages
when they are updated, removed, disabled, replaced, etc.
Sample app:ag/848432
Change-Id: I25b29c98152dcad9ede4d4eb040cc897b7f93426
Amith Yamasani [Fri, 20 Nov 2015 17:44:08 +0000 (09:44 -0800)]
Fix missing observer reply callbacks
This was causing upto 2 seconds in user switching delay.
Bug:
25813588
Change-Id: Icf23b021f134a8ccfa2dae470af02b2da7454acc
Vladislav Kaznacheev [Sat, 13 Feb 2016 02:03:27 +0000 (02:03 +0000)]
Merge "Update pointer icon when View.setPointerIcon is called" into nyc-dev
Winson [Sat, 13 Feb 2016 00:06:04 +0000 (16:06 -0800)]
Minor tweaks
- Initializing to focused state when going into Recents
- Dimming the front-most tasks to highlight the focused task
- Fixing wrong call to resize in the LruCache
Change-Id: I41833a9dc59a9bdf4a94b698e4800c1019bceb01
Winson [Fri, 12 Feb 2016 00:40:36 +0000 (16:40 -0800)]
Adjusting the tuner flags to allow disabling fast toggle.
Change-Id: I0da29479c075a41ddb49e9852eb912604efa9aa8
Winson [Wed, 10 Feb 2016 21:29:39 +0000 (13:29 -0800)]
Moving dim calculation into the stack layout.
- This simplifies code and also prepares the code for dimming certain
tasks when focused.
- Ensuring that cancelling transitions will completely remove all
listeners in a given animation.
Change-Id: I77050d94097f9af404250c287522d83c146cfb25
Aga Wronska [Sat, 13 Feb 2016 00:57:23 +0000 (00:57 +0000)]
Merge "Fix Rename Document tests" into nyc-dev
Vladislav Kaznacheev [Wed, 10 Feb 2016 20:19:33 +0000 (12:19 -0800)]
Update pointer icon when View.setPointerIcon is called
Currently the updated pointer icon is only displayed after
the next mouse move.
Bug:
27107871
Change-Id: Ieed57b07fe44699735179cf57968a9bb08981396
Aga Wronska [Thu, 11 Feb 2016 01:26:29 +0000 (17:26 -0800)]
Fix Rename Document tests
Bug:
27109148
Change-Id: I489b2bd25f92ebc2b9b84d9cefe1f785a89c89ff
Chong Zhang [Fri, 12 Feb 2016 23:34:10 +0000 (15:34 -0800)]
Clearing mDestroying flag when app is made visible again
If not cleared window will remain invisible and can't receive inputs,
which coud lead to ANR.
Also continue looking for windows to be destroyed instead of stopping
on first one that's not removed by client.
bug:
27123118
Change-Id: I27048779886c69eb6e7ad5e21210be511416d8b6
Jeremy Joslin [Fri, 18 Dec 2015 01:38:04 +0000 (17:38 -0800)]
Exit getAllValidScorers early if not the primary.
This fixes the crash that occurs when getAllValidScorers() is invoked by
a non-primary user when a scorer is active.
BUG:
23040221
Change-Id: I42c9e18d74389be3191258ca5626f2c433ca7cc7
(cherry picked from commit
5b294b45d0d7afbed71fd2e59342c5ad7b8b7d76)
Tenghui Zhu [Fri, 12 Feb 2016 23:47:26 +0000 (23:47 +0000)]
Merge "Fix the CSL theme support inside VectorDrawable's fill and stroke" into nyc-dev
Hangyu Kuang [Fri, 12 Feb 2016 23:30:48 +0000 (23:30 +0000)]
Merge "Update Android mediamuxer documentation as it supports webm already." into nyc-dev
Joe Onorato [Fri, 12 Feb 2016 22:56:13 +0000 (22:56 +0000)]
Merge "Turn down the logging a little bit." into nyc-dev
Joe Onorato [Tue, 2 Feb 2016 01:47:51 +0000 (17:47 -0800)]
Turn down the logging a little bit.
Change-Id: Iec36925e3aff1490c8808bdc7a6bd39e7d549556
Phil Burk [Fri, 12 Feb 2016 22:24:53 +0000 (22:24 +0000)]
Merge "AudioFormat: implement ENCODING_IEC61937" into nyc-dev
John Reck [Fri, 12 Feb 2016 22:24:00 +0000 (22:24 +0000)]
Merge "Include containing window title in SurfaceView's title" into nyc-dev
Amith Yamasani [Fri, 12 Feb 2016 21:29:14 +0000 (21:29 +0000)]
Merge "Use hasInternetPermission method" into nyc-dev
Zachary Kuznia [Thu, 11 Feb 2016 22:15:06 +0000 (14:15 -0800)]
Update the timeout values for accessibility gestures.
Change-Id: I1e6ed7bbec46b848c1278922be3110733a64dcb6
(cherry picked from commit
0522205fd5fdc460fb7af78a3ac4a17fcb988ac5)
Shreyas Basarge [Fri, 12 Feb 2016 21:16:31 +0000 (21:16 +0000)]
Merge "Add defaultPeriodic to every authority" into nyc-dev
Adam Powell [Fri, 12 Feb 2016 21:14:37 +0000 (21:14 +0000)]
Merge "ChooserActivity direct share jank fixes" into nyc-dev
Aurimas Liutikas [Fri, 12 Feb 2016 20:58:04 +0000 (20:58 +0000)]
Merge "Start saving iconified state of SearchView." into nyc-dev
Jae Seo [Fri, 12 Feb 2016 20:50:43 +0000 (20:50 +0000)]
Merge "TIF: Check the CEC message length before copying the data" into nyc-dev
Shreyas Basarge [Fri, 12 Feb 2016 20:27:49 +0000 (20:27 +0000)]
Add defaultPeriodic to every authority
Adds a default periodic sync to every
authority on boot so that subscribedfeeds
adapter gets back its periodic sync if lost.
This change will bereverted in the next droidfood
build.
Change-Id: Icae76c2baafb471ad69d01a4c65023dc6f6525c0
Amith Yamasani [Fri, 12 Feb 2016 20:43:15 +0000 (12:43 -0800)]
Use hasInternetPermission method
Followup to Bug:
27165396
Change-Id: Ibdf6f5dd15197d4e19d7c7729612c13a02cdbf2b
Ben Wagner [Fri, 12 Feb 2016 20:32:02 +0000 (20:32 +0000)]
Merge "Deduplicate font file mappings." into nyc-dev
Julia Reynolds [Fri, 12 Feb 2016 20:31:54 +0000 (20:31 +0000)]
Merge "Show topic settings inline if user has configured topics." into nyc-dev
Amith Yamasani [Fri, 12 Feb 2016 20:27:54 +0000 (20:27 +0000)]
Merge "When the device boots up, netd works more than required" into nyc-dev
Dan Sandler [Tue, 29 Dec 2015 20:45:39 +0000 (15:45 -0500)]
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Never attribute to malice that which is adequately explained
by a bug, particularly one involving date math.
Bug:
26326394
Change-Id: I3483ac102c678a8852565c8ea94c06e19b3f26d8
(cherry picked from commit
8d9aea8a1870ad83d9eccba1068a1685da5e96d0)
Ben Wagner [Thu, 28 Jan 2016 21:05:33 +0000 (16:05 -0500)]
Deduplicate font file mappings.
With ttc and gx variation fonts, it is now possible and common that a
number of fonts will use the same font file for data but with different
parameters. In the current code each font will map the font file data,
taking up an unecessary amount of virtual address space and is
inefficient with respect to memory management (like the tlb). This CL
deduplicates these file mappings so that a given font file will only be
mapped into memory once.
DO NOT MERGE
Change-Id: I5ca69f963a434c72ec4028402ecbf9e0f0ee7148
(cherry picked from commit
fffcf0a31fd4c9a4ec8aa7de70b1eda0d48fb337)
Jorim Jaggi [Thu, 11 Feb 2016 06:16:06 +0000 (22:16 -0800)]
Fix layout for full-screen floating windows
When the app doesn't set IN_SCREEN and INSET_DECOR but the window is
still full-screen, we force SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN but then
we still need to communicate the content insets to the DecorView.
In DecorView, we consume these insets in this mode and set it as
layout params so this behavior is completely transparent for the
app.
Bug:
26464646
Change-Id: Ib7332b845767a5bbc0266c380bf6240e322db943
Julia Reynolds [Fri, 12 Feb 2016 19:00:42 +0000 (19:00 +0000)]
Merge "Possibly fix deadlock." into nyc-dev
Julia Reynolds [Thu, 11 Feb 2016 13:54:24 +0000 (08:54 -0500)]
Possibly fix deadlock.
Bug:
27122790
Change-Id: I4361cc09e34ea71d7d69a54330ce52574c2b9b3d
Selim Cinek [Fri, 12 Feb 2016 18:56:45 +0000 (18:56 +0000)]
Merge changes If981a380,I48a8f882,I4b248b2f,Id9e6ce2a,Ib5239325, ... into nyc-dev
* changes:
Fixed a bug where custom notifications were invisible
Fixed a transformation error when fading in views
Fixed animation jank in notification groups
Fixed a bug where the single line view would be invisible
Fixed a bug where huns could be invisible
Fixed a crash with notification children
Hangyu Kuang [Fri, 12 Feb 2016 18:52:31 +0000 (10:52 -0800)]
Update Android mediamuxer documentation as it supports webm already.
Bug:
27075269
Change-Id: Ie2571bb90b6d8dac85dad48d845e21c80b2b250f
Adrian Roos [Fri, 5 Feb 2016 22:19:01 +0000 (14:19 -0800)]
Add setting for allowing remote input from keyguard
Bug:
26440855
Change-Id: I539b1c7ee6a874283df1104fe0743ef0495f9510
Ben Wagner [Fri, 12 Feb 2016 18:50:11 +0000 (18:50 +0000)]
Merge "Add support for gx font variation axes." into nyc-dev
Soi, Yoshinari [Tue, 22 Dec 2015 03:02:18 +0000 (12:02 +0900)]
When the device boots up, netd works more than required
When the device boots up, netd adds rules for applications
which do not have the NETWORK permission to iptables.
Therefore, optimize NetworkPolicyManagerService to not touch
uids that do not have the NETWORK permission.
This modification is similar to Google commit
88e98dfa5.
Cherry picked from AOSP commit to master.
Bug:
27165396
Change-Id: Ic8bb837143b9e349859210654248195d62b73d17
Vladislav Kaznacheev [Fri, 12 Feb 2016 18:22:20 +0000 (18:22 +0000)]
Merge "Make drag and drop comply with cross profile copy paste policy" into nyc-dev
Vladislav Kaznacheev [Fri, 12 Feb 2016 02:58:41 +0000 (18:58 -0800)]
Make drag and drop comply with cross profile copy paste policy
If UserManager.DISALLOW_CROSS_PROFILE_COPY_PASTE is false
then drag and drop is only possible between apps from the same
profile.
This CL also supports cross-profile content URI grants.
Bug:
26772503
Change-Id: I2e160cfdc6259fee2ea5e561c6e21fc0547dca2e
Teng-Hui Zhu [Thu, 11 Feb 2016 22:48:19 +0000 (14:48 -0800)]
Fix the CSL theme support inside VectorDrawable's fill and stroke
b/
26774249
Change-Id: I9a9fcdb0e88c4b46ab86c6b3fd780d40b96024db
(cherry picked from commit
15cc49ae521699b70e3b011768b2ae58a7a9b2fd)
Rubin Xu [Fri, 12 Feb 2016 17:22:48 +0000 (17:22 +0000)]
Small refactoring to eliminate the need to allocate array.
Change-Id: Ib08a16e40c342b12e4f7106376f46d6279f29f2b
Matt Sarett [Fri, 12 Feb 2016 17:08:32 +0000 (17:08 +0000)]
Merge "Use SkCodec::MinBufferedBytes() for front buffered image decode stream" into nyc-dev
Neil Fuller [Fri, 12 Feb 2016 15:38:34 +0000 (15:38 +0000)]
Add flags needed to switch Jack to 1.8 for CTS targets
When linking against .jack files that contain 1.8 language
features Jack (currently) requires -D jack.java.source.version=1.8.
"core-tests" includes 1.8 language features.
Bug:
27113322
Bug:
26953739
Change-Id: If40239d4af59a3d3f71b22e8ef2a07e553c8d5c2
Jean-Michel Trivi [Fri, 12 Feb 2016 16:57:49 +0000 (16:57 +0000)]
Merge "Dynamic audio policies: JNI support for UID rules" into nyc-dev
Julia Reynolds [Fri, 12 Feb 2016 16:12:54 +0000 (11:12 -0500)]
Show topic settings inline if user has configured topics.
Change-Id: Icf51faad61b3ae4261991691a1d679b190ea712a
Ritesh Reddy [Fri, 12 Feb 2016 16:30:47 +0000 (16:30 +0000)]
Merge "Stashing SyncSettings for accounts added aft SUW" into nyc-dev
Ben Wagner [Fri, 6 Nov 2015 16:57:09 +0000 (11:57 -0500)]
Add support for gx font variation axes.
This adds an 'axis' child element to the 'font' element. The 'axis'
element has attributes 'tag' (a four byte identifier) and 'stylevalue'
(a float value) to the parser. This also modifies reading the font file
name in a backwards compatible fashion by using only the direct #text
children of the 'font' element. (Both the Minikin and Skia parsers now
allow the font file name on a separate line in the fonts.xml file).
This information is then passed through to Skia in order to select the
desired variation. The Skia parser already parses this way and has for
some time, so Chrome and WebView can already read this format.
Change-Id: I15623fe864fa92b2bf0705af5e389daedfb77e5c
(cherry picked from commit
b8e367fb7428076ff2e4aa2a97adaed1ef806e92)
Paul Stewart [Fri, 12 Feb 2016 16:27:07 +0000 (16:27 +0000)]
Merge "Revert "Properly map EAP-GTC for TTLS"" into mm-wireless-dev
am:
323561773f
* commit '
323561773f43f561997155aed4654a6be3299511':
Revert "Properly map EAP-GTC for TTLS"
Paul Stewart [Fri, 12 Feb 2016 16:23:43 +0000 (16:23 +0000)]
Merge "Revert "Properly map EAP-GTC for TTLS"" into mm-wireless-dev
Paul Stewart [Fri, 12 Feb 2016 16:21:01 +0000 (16:21 +0000)]
Revert "Properly map EAP-GTC for TTLS"
This reverts commit
be5084b87aa6a5e97becac6a43b448fee34196c2.
Reverting to re-land after test team does their thing
Change-Id: Ia236b77f08d15f47efb5469478000ded3b0d7954
Paul Stewart [Fri, 12 Feb 2016 16:12:37 +0000 (16:12 +0000)]
Merge "Properly map EAP-GTC for TTLS" into mm-wireless-dev
am:
724ea69e4b
* commit '
724ea69e4b4d79d59629e8152f2b0183e13aa45e':
Properly map EAP-GTC for TTLS
John Reck [Fri, 12 Feb 2016 16:11:30 +0000 (16:11 +0000)]
Merge "Fix bytesPerPixel for SurfaceTexture" into nyc-dev
John Reck [Fri, 12 Feb 2016 16:08:29 +0000 (08:08 -0800)]
Fix bytesPerPixel for SurfaceTexture
Bug:
27158985
Change-Id: I148a86d76314681eb778292dd0eb64503375f328
Paul Stewart [Fri, 12 Feb 2016 16:07:18 +0000 (16:07 +0000)]
Merge "Properly map EAP-GTC for TTLS" into mm-wireless-dev
Ritesh Reddy [Wed, 23 Dec 2015 18:24:23 +0000 (18:24 +0000)]
Stashing SyncSettings for accounts added aft SUW
Stashing SyncSettings for accounts not added by SUW Restore time
and restoring these settings whenever the account is added.
Bug:
26181613
Change-Id: Ia83e3fd43385a05424a8991115aa21ac90f4cd49
Narayan Kamath [Fri, 12 Feb 2016 15:41:31 +0000 (15:41 +0000)]
Merge "Track libcore change
9fbdd1b27de1a3d1005468108." into nyc-dev
Matt Sarett [Thu, 11 Feb 2016 22:03:54 +0000 (17:03 -0500)]
Use SkCodec::MinBufferedBytes() for front buffered image decode stream
This should not change decode behavior, but it's worth noting that
the number of bytes buffered will decrease from 64 to 30.
Change-Id: I66b0e38a487c1786823b0125686b094dae5d13dc
Sergey Poromov [Fri, 12 Feb 2016 15:05:59 +0000 (15:05 +0000)]
Merge "Use long for preflight check size in BackupManagerService." into nyc-dev
Kenny Guy [Fri, 12 Feb 2016 15:01:34 +0000 (15:01 +0000)]
Merge "Support FBE for managed profiles." into nyc-dev
Rubin Xu [Fri, 12 Feb 2016 14:40:10 +0000 (14:40 +0000)]
Merge "Maintain mSetupCompletedUsers for profiles correctly" into nyc-dev
Kenny Guy [Tue, 9 Feb 2016 16:02:35 +0000 (16:02 +0000)]
Support FBE for managed profiles.
Allow launcher to see and attempt to launch non-crypto
aware application when profile is locked.
Hide unlock notification until parent user is unlocked.
Have unlock notitication use confirm credentials to unlock
the profile.
Updated notification strings as per suggestions in mocks
to make it clearer between users and profiles.
Bug:
27038260
Change-Id: If2d2c8148670d814544f4edd44193d15da32a289
Rubin Xu [Fri, 12 Feb 2016 13:47:04 +0000 (13:47 +0000)]
Maintain mSetupCompletedUsers for profiles correctly
When listening for USER_SETUP_COMPLETE changes, refresh the state for
the affected user instead of the current foreground user which excludes
the active managed profile.
Bug:
27061092
Change-Id: Iae525464d3d3faab9afb76aaf4304b9f10382e01
Clara Bayarri [Fri, 12 Feb 2016 13:54:09 +0000 (13:54 +0000)]
Merge "Add support for current failed lock attempts and max attempts" into nyc-dev
Clara Bayarri [Thu, 11 Feb 2016 17:48:53 +0000 (17:48 +0000)]
Add support for current failed lock attempts and max attempts
This is needed from Settings to show a message informing the user
of the number of attempts before their work profile gets wiped
when using ConfirmDeviceCredentials.
Bug:
26677759
Change-Id: I4b16f7dc2f415d0ce0215a3b7a646f98fabece33
Derek Sollenberger [Fri, 12 Feb 2016 13:40:42 +0000 (13:40 +0000)]
Merge "Update HWUI makefiles to support use by other targets (e.g. Skia)" into nyc-dev
Rubin Xu [Fri, 12 Feb 2016 11:53:44 +0000 (11:53 +0000)]
Merge "Fix testApplicationRestrictionsManagingApp unit test" into nyc-dev