OSDN Git Service
TreeHugger Robot [Tue, 14 Jun 2016 11:46:58 +0000 (11:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 14 Jun 2016 11:46:23 +0000 (11:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Paul Jensen [Tue, 14 Jun 2016 11:16:12 +0000 (11:16 +0000)]
Merge \"Show sign-in to network notification to all users, not just owner.\" into nyc-dev
am:
78452db285
Change-Id: I4522f765c6166bd1c8216088b1605eac4c69d869
Paul Jensen [Tue, 14 Jun 2016 11:05:31 +0000 (11:05 +0000)]
Merge "Show sign-in to network notification to all users, not just owner." into nyc-dev
Bill Yi [Tue, 14 Jun 2016 06:41:02 +0000 (23:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia4719090589aaee67824a31eebfecfc5bc43ce81
Auto-generated-cl: translation import
Bill Yi [Tue, 14 Jun 2016 06:19:33 +0000 (23:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I038e3f98dc7d9fa52fdfd5c5cf2240214e52edc6
Auto-generated-cl: translation import
Tomasz Mikolajewski [Tue, 14 Jun 2016 04:24:39 +0000 (04:24 +0000)]
Merge \"Make CotentResolver#openInputStream handle errors from reliable pipes.\" into nyc-dev
am:
ac3fe8fffe
Change-Id: Ib09cea9ca5c6bb18dc16ffac70f23fa4b3ffd974
Tomasz Mikolajewski [Tue, 14 Jun 2016 04:15:25 +0000 (04:15 +0000)]
Merge "Make CotentResolver#openInputStream handle errors from reliable pipes." into nyc-dev
Kevin Hufnagle [Tue, 14 Jun 2016 03:04:33 +0000 (03:04 +0000)]
Merge \"docs: Expanded description of \"Key Attestation\" N Preview feature.\" into nyc-dev
am:
f6250cc7df
Change-Id: Ic5623e1cf811e7a668bb9420d8522b610fe320ff
Kevin Hufnagle [Tue, 14 Jun 2016 02:53:29 +0000 (02:53 +0000)]
Merge "docs: Expanded description of "Key Attestation" N Preview feature." into nyc-dev
Chris Thornton [Tue, 14 Jun 2016 01:37:40 +0000 (01:37 +0000)]
Merge "Store the vendor UUID of a KeyphraseSoundModel in the database" into nyc-mr1-dev
Joe Fernandez [Tue, 14 Jun 2016 01:25:20 +0000 (01:25 +0000)]
Merge \"docs: Add Videos section to N Preview landing page\" into nyc-dev
am:
e335ccdc00
Change-Id: Ieb7e459071a5cfb4ddc7f6ae13c93628d2295456
Joe Fernandez [Tue, 14 Jun 2016 01:13:25 +0000 (01:13 +0000)]
Merge "docs: Add Videos section to N Preview landing page" into nyc-dev
Joe Fernandez [Mon, 13 Jun 2016 17:11:13 +0000 (10:11 -0700)]
docs: Add Videos section to N Preview landing page
b/
29215717
Change-Id: I0bcd995a0a458e7624d1e8a689cb3eb249f9397d
Aurimas Liutikas [Tue, 14 Jun 2016 01:08:29 +0000 (01:08 +0000)]
Merge \\\"Fix a spelling error in Supporting Languages page.\\\" into mnc-io-docs am:
ab239a0c1a am:
5699312627
am:
a53fc1f2c0
Change-Id: I48d80c227fc5cfb37c283e1152fea4068568581f
Aurimas Liutikas [Tue, 14 Jun 2016 01:08:27 +0000 (01:08 +0000)]
Merge \\\"Swap fill_parent with match_parent in best practices doc.\\\" into mnc-io-docs am:
df4528fbe8 am:
1729c75f73
am:
8bf5f6c851
Change-Id: I04cee25a3584cfb97753bcf5d8afcde525c57999
Aurimas Liutikas [Tue, 14 Jun 2016 01:08:22 +0000 (01:08 +0000)]
Merge \\\"Correct parentActivity example in Activity Element docs.\\\" into mnc-io-docs am:
893413e50c am:
ce2e9d8716
am:
3f1741a19c
Change-Id: I0dd154fa1d66744136fe646a338387b004f7b827
Aurimas Liutikas [Tue, 14 Jun 2016 00:57:28 +0000 (00:57 +0000)]
Merge \\"Fix a spelling error in Supporting Languages page.\\" into mnc-io-docs am:
ab239a0c1a
am:
5699312627
Change-Id: I7e7e4777b0475a7c2dd242370a6900cfd4457f90
Aurimas Liutikas [Tue, 14 Jun 2016 00:57:24 +0000 (00:57 +0000)]
Merge \\"Swap fill_parent with match_parent in best practices doc.\\" into mnc-io-docs am:
df4528fbe8
am:
1729c75f73
Change-Id: I074f24ee54e2ec7005e31a6528f54068c6e1eb3c
Aurimas Liutikas [Tue, 14 Jun 2016 00:57:18 +0000 (00:57 +0000)]
Merge \\"Correct parentActivity example in Activity Element docs.\\" into mnc-io-docs am:
893413e50c
am:
ce2e9d8716
Change-Id: I90462329a4fbdd264714c653b0df30cbc9f4f866
Aurimas Liutikas [Tue, 14 Jun 2016 00:48:55 +0000 (00:48 +0000)]
Merge \"Fix a spelling error in Supporting Languages page.\" into mnc-io-docs
am:
ab239a0c1a
Change-Id: I2de3485349f22c1eae990808c81320c8a995430d
Aurimas Liutikas [Tue, 14 Jun 2016 00:48:50 +0000 (00:48 +0000)]
Merge \"Swap fill_parent with match_parent in best practices doc.\" into mnc-io-docs
am:
df4528fbe8
Change-Id: Ie2039cf96c3591b6fc2c0cb8ec1097707edcc76b
Aurimas Liutikas [Tue, 14 Jun 2016 00:48:43 +0000 (00:48 +0000)]
Merge \"Correct parentActivity example in Activity Element docs.\" into mnc-io-docs
am:
893413e50c
Change-Id: I845619909443f9d56bfc7d9f5284b15c2587c5d6
Chad Brubaker [Tue, 14 Jun 2016 00:47:21 +0000 (00:47 +0000)]
Merge \"Use NoPreloadHolder for certificate sources\" into nyc-dev
am:
c738e48ed6
Change-Id: Iaf9a202979335c18b2c55c27530ef84e129ccf76
TreeHugger Robot [Tue, 14 Jun 2016 00:35:48 +0000 (00:35 +0000)]
Merge "Use NoPreloadHolder for certificate sources" into nyc-dev
Aurimas Liutikas [Tue, 14 Jun 2016 00:33:52 +0000 (00:33 +0000)]
Merge "Fix a spelling error in Supporting Languages page." into mnc-io-docs
Aurimas Liutikas [Tue, 14 Jun 2016 00:33:19 +0000 (00:33 +0000)]
Merge "Swap fill_parent with match_parent in best practices doc." into mnc-io-docs
Aurimas Liutikas [Tue, 14 Jun 2016 00:31:46 +0000 (00:31 +0000)]
Merge "Correct parentActivity example in Activity Element docs." into mnc-io-docs
Yohei Yukawa [Tue, 14 Jun 2016 00:26:37 +0000 (00:26 +0000)]
Merge "Add InputConnection#insertContent()." into nyc-mr1-dev
TreeHugger Robot [Mon, 13 Jun 2016 23:46:33 +0000 (23:46 +0000)]
Merge "Test RenderNode's prepareTree when its DL is null and non-null" into nyc-mr1-dev
Kevin Hufnagle [Thu, 9 Jun 2016 23:02:31 +0000 (16:02 -0700)]
docs: Expanded description of "Key Attestation" N Preview feature.
The Key Attestation section within the Android N Preview "API
Overview" page now links to a separate page, which contains a
procedure for completing the attestation process, as well as the
certificate schema and its elements' associated descriptions.
Bug:
28851641
Change-Id: If96af7f5e7e6ba9297f48f20c669591b1a9ee9ce
ggfan [Mon, 13 Jun 2016 23:33:00 +0000 (23:33 +0000)]
Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo am:
c1755d345d am:
999b7afac8
am:
3c76d062ae
Change-Id: Ie9bbfe3e7238dbf4e993a3478b93c89404e79bec
ggfan [Mon, 13 Jun 2016 23:21:33 +0000 (23:21 +0000)]
Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo am:
c1755d345d
am:
999b7afac8
Change-Id: I7f3c8d7c65373570193fe5fde940698c1eb3f3e9
Dan Willemsen [Mon, 13 Jun 2016 23:17:51 +0000 (23:17 +0000)]
Merge \"CtsShim: Support building with tapas\" into nyc-dev
am:
c47168d592
Change-Id: I2992316e7c9f63b64892ff5e8de6a85a903617cb
ggfan [Mon, 13 Jun 2016 23:12:49 +0000 (23:12 +0000)]
Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo
am:
c1755d345d
Change-Id: I881cd1e70e422267dbe345be525330f18bae4126
Andrew Solovay [Mon, 13 Jun 2016 23:07:30 +0000 (23:07 +0000)]
Merge \"docs: Noted that N Preview doc is available online as of DP4\" into nyc-dev
am:
98d2f591e0
Change-Id: Id5b4c31320edd85c89d6fde4f09a48243790cdbd
Dan Willemsen [Mon, 13 Jun 2016 23:07:05 +0000 (23:07 +0000)]
Merge "CtsShim: Support building with tapas" into nyc-dev
TreeHugger Robot [Mon, 13 Jun 2016 22:56:09 +0000 (22:56 +0000)]
Merge "docs: Noted that N Preview doc is available online as of DP4" into nyc-dev
ggfan [Thu, 9 Jun 2016 19:44:01 +0000 (12:44 -0700)]
Update validation-layer.jd for NDK-R12:
use packed layer binaries
punt building layers to Khronos github repo
Change-Id: Icf840de42856d2488a87174b2cd6c604ef8d8770
(cherry picked from commit
f22d094a30c9446abe074b82bb84f6daf51e0534)
Chad Brubaker [Mon, 13 Jun 2016 22:51:40 +0000 (15:51 -0700)]
Use NoPreloadHolder for certificate sources
The static instances of SystemCertificateSource and
UserCertificateSource depend on the current user, avoid triggering their
static initializer when preloaded.
Bug:
29258379
Change-Id: I5088366ae67145b8bc928d6c04118529c82a7fc3
Adrian Roos [Mon, 13 Jun 2016 22:49:11 +0000 (22:49 +0000)]
Merge \"Correclty capitalize Date in status bar panel\" into nyc-dev
am:
366f324113
Change-Id: I825b14e12ec6f4f3896629bd66f882b6f2e9ffec
Adrian Roos [Mon, 13 Jun 2016 22:39:50 +0000 (22:39 +0000)]
Merge "Correclty capitalize Date in status bar panel" into nyc-dev
Chong Zhang [Mon, 13 Jun 2016 22:26:39 +0000 (22:26 +0000)]
Merge \"Prevent crash from null ApplicationInfo after package is removed.\" into nyc-dev
am:
42edc7c2c2
Change-Id: I6400e818f7333323e633756bf63e582e5b658900
Chong Zhang [Mon, 13 Jun 2016 22:16:35 +0000 (22:16 +0000)]
Merge "Prevent crash from null ApplicationInfo after package is removed." into nyc-dev
Chong Zhang [Mon, 13 Jun 2016 21:41:41 +0000 (14:41 -0700)]
Prevent crash from null ApplicationInfo after package is removed.
Bug:
29234926
Change-Id: I8c2fed7c7e862e1f6798d5ed535d1937f9a74c1a
Doris Liu [Mon, 13 Jun 2016 21:49:26 +0000 (14:49 -0700)]
Test RenderNode's prepareTree when its DL is null and non-null
BUG:
29320878
Change-Id: I3325e957025d0039faf366144dcd2d95790ccfd1
Andrii Kulian [Mon, 13 Jun 2016 22:02:45 +0000 (22:02 +0000)]
Merge \"Don\'t update task to return to type for last task over home\" into nyc-dev
am:
62b08eb5f2
Change-Id: Ib6767e4e7e31c6714687bb89ba51f82c0e5ba4b0
Andrii Kulian [Mon, 13 Jun 2016 21:55:46 +0000 (21:55 +0000)]
Merge "Don't update task to return to type for last task over home" into nyc-dev
Adrian Roos [Mon, 13 Jun 2016 21:55:06 +0000 (21:55 +0000)]
Merge \"Add MessagingStyle transitions\" into nyc-dev
am:
a5e2aa99c0
Change-Id: Ib667411e14309d38f60b254178d7fc7d71eedde0
Doris Liu [Mon, 13 Jun 2016 21:45:40 +0000 (21:45 +0000)]
Merge "Chcek for valid render content before damaging RenderNode for dirty VD" into nyc-mr1-dev
Adrian Roos [Mon, 13 Jun 2016 21:45:07 +0000 (21:45 +0000)]
Merge "Add MessagingStyle transitions" into nyc-dev
Adrian Roos [Thu, 2 Jun 2016 00:09:45 +0000 (17:09 -0700)]
Add MessagingStyle transitions
Fixes a particularly bad transition in the case where there
is one incoming message to a group.
Change-Id: Ieddece4a496292a69e14cdcd74d94986938d8223
Fixes:
29043489
Andrew Solovay [Mon, 13 Jun 2016 21:31:15 +0000 (21:31 +0000)]
Merge \\\"docs: Corrected method name in multi-window docs\\\" into mnc-io-docs am:
0e68b6b5fc am:
2c0261224a
am:
2cb6ca1892
Change-Id: Ia522743ff32e9a2a2714f66118dbaaebd7fae563
Andrew Solovay [Mon, 13 Jun 2016 21:24:19 +0000 (21:24 +0000)]
Merge \\"docs: Corrected method name in multi-window docs\\" into mnc-io-docs am:
0e68b6b5fc
am:
2c0261224a
Change-Id: I52a482a04b5a8789d48a5347c9a5fc63010462b6
Makoto Onuki [Mon, 13 Jun 2016 21:23:18 +0000 (21:23 +0000)]
Merge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
am:
f419bd9e03
Change-Id: Ic3071f3a712da72fd141ef37ac6aabe6dbd09355
Jason Monk [Mon, 13 Jun 2016 21:23:06 +0000 (21:23 +0000)]
Merge \"Make sure we don\'t accidentally allow the night mode tile\" into nyc-dev
am:
126366dde5
Change-Id: I0f256958b8596ab07e27c6c026dc7e37d5a4028f
Daniel Nishi [Mon, 13 Jun 2016 21:18:28 +0000 (21:18 +0000)]
Merge "Add a flag to toggle how much the storage manager should retain." into nyc-mr1-dev
Andrew Solovay [Mon, 13 Jun 2016 21:17:09 +0000 (21:17 +0000)]
Merge \"docs: Corrected method name in multi-window docs\" into mnc-io-docs
am:
0e68b6b5fc
Change-Id: I93b8a2788eadbfeac3b2d293e42d2cef0a42eae4
Makoto Onuki [Mon, 13 Jun 2016 21:16:28 +0000 (21:16 +0000)]
Merge "Push DO/PO package names from DPMS to PM" into nyc-dev
Winson [Mon, 13 Jun 2016 21:16:12 +0000 (21:16 +0000)]
Merge \"Ensuring we don\'t try and dismiss task views that are already removed.\" into nyc-dev
am:
c169a9d8a1
Change-Id: Ib55a3b8c0c369a14989b4155a81c3844f99d59bb
TreeHugger Robot [Mon, 13 Jun 2016 21:13:35 +0000 (21:13 +0000)]
Merge "Make sure we don't accidentally allow the night mode tile" into nyc-dev
TreeHugger Robot [Mon, 13 Jun 2016 21:12:46 +0000 (21:12 +0000)]
Merge "docs: Corrected method name in multi-window docs" into mnc-io-docs
Winson Chung [Mon, 13 Jun 2016 21:06:37 +0000 (21:06 +0000)]
Merge "Ensuring we don't try and dismiss task views that are already removed." into nyc-dev
Bert McMeen [Mon, 13 Jun 2016 20:40:18 +0000 (20:40 +0000)]
Docs: Fixed one of the addListener() links am:
33a1ea297d am:
ba86350c63
am:
51487f06f9
Change-Id: I6bbff5d2d8011acc93e20d5d28d1f87ce3968019
Bert McMeen [Mon, 13 Jun 2016 20:36:12 +0000 (20:36 +0000)]
Docs: Fixed one of the addListener() links am:
33a1ea297d
am:
ba86350c63
Change-Id: I505bc79896257c07dbeee8ed60496350f1d2668a
Doris Liu [Mon, 13 Jun 2016 20:31:32 +0000 (20:31 +0000)]
Merge \"Fix setCurrentPlayTime for started but not yet pulsed animations\" into nyc-dev
am:
42d39300cf
Change-Id: I7c1f2adb31ece266b082ffb9ea85b17c083b518c
Bert McMeen [Mon, 13 Jun 2016 20:31:28 +0000 (20:31 +0000)]
Docs: Fixed one of the addListener() links
am:
33a1ea297d
Change-Id: Ia54cdf5de78ad7357cab5617753f5bf28ea89487
Doris Liu [Mon, 13 Jun 2016 20:24:44 +0000 (20:24 +0000)]
Merge "Fix setCurrentPlayTime for started but not yet pulsed animations" into nyc-dev
Yorke Lee [Mon, 13 Jun 2016 20:15:15 +0000 (20:15 +0000)]
Merge \"Check for detached view in drag-related APIs\" into nyc-dev
am:
cdc9d7bed9
Change-Id: Id1c2228d081e63e86278072654c4c611bdb10d1a
TreeHugger Robot [Mon, 13 Jun 2016 20:09:42 +0000 (20:09 +0000)]
Merge "Check for detached view in drag-related APIs" into nyc-dev
Svetoslav Ganov [Mon, 13 Jun 2016 20:03:40 +0000 (20:03 +0000)]
Merge \"Fix permissions update for VrListenerService on user changes.\" into nyc-dev
am:
d054f4f2fe
Change-Id: Ib69afe57e65ea7564be3bd97124ac950862d71cb
Ruben Brunk [Mon, 13 Jun 2016 19:58:30 +0000 (19:58 +0000)]
Merge "Fix permissions update for VrListenerService on user changes." into nyc-dev
Doris Liu [Mon, 13 Jun 2016 19:52:44 +0000 (12:52 -0700)]
Chcek for valid render content before damaging RenderNode for dirty VD
BUG:
29320878
Change-Id: I847d76467bad92c956a4bb7617627983d64e90f9
Jason Monk [Mon, 13 Jun 2016 19:39:11 +0000 (15:39 -0400)]
Make sure we don't accidentally allow the night mode tile
Bug:
28887927
Change-Id: I7cf9ae3f0c853d70172b2af3e75cd8d0106afde1
Mark Renouf [Mon, 13 Jun 2016 19:36:03 +0000 (19:36 +0000)]
Merge "Set hintTextColor and composingSpan style for EditText and extract view" into nyc-mr1-dev
Mark Renouf [Mon, 13 Jun 2016 15:21:32 +0000 (11:21 -0400)]
Set hintTextColor and composingSpan style for EditText and extract view
BUG: 339521
BUG: 339542
Change-Id: I4bcaf1f237cd32cdc683c4d9620c7d63134e7c6e
Winson [Mon, 13 Jun 2016 19:14:45 +0000 (12:14 -0700)]
Ensuring we don't try and dismiss task views that are already removed.
Bug:
29240786
Change-Id: I724e7c366b2fb835fd81fa966689f999953ef4c8
Bert McMeen [Fri, 10 Jun 2016 22:50:54 +0000 (15:50 -0700)]
Docs: Fixed one of the addListener() links
Bug:
28454953
Change-Id: I00002c8bba42e972331d5d80193094606243e252
Yorke Lee [Mon, 13 Jun 2016 18:31:03 +0000 (11:31 -0700)]
Check for detached view in drag-related APIs
Bug:
29253539
Change-Id: I26285404ee15bb17e87ac23c67f7c3c6aaa2d968
ggfan [Mon, 13 Jun 2016 18:31:01 +0000 (18:31 +0000)]
Merge \"Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo\" into nyc-dev
am:
da66010cd8
Change-Id: Ie29b9ca18f5ff4039aade7f07b4c59a3b25d7263
Jason Monk [Mon, 13 Jun 2016 18:30:58 +0000 (18:30 +0000)]
Merge \"Fix QS edit view accessibility classes\" into nyc-dev
am:
0809964452
Change-Id: Ia562b52fff2f6efa4355b9d6ffe8af67fd845b98
Gerry Fan [Mon, 13 Jun 2016 18:27:08 +0000 (18:27 +0000)]
Merge "Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo" into nyc-dev
TreeHugger Robot [Mon, 13 Jun 2016 18:24:46 +0000 (18:24 +0000)]
Merge "Fix QS edit view accessibility classes" into nyc-dev
ggfan [Thu, 9 Jun 2016 19:44:01 +0000 (12:44 -0700)]
Update validation-layer.jd for NDK-R12:
use packed layer binaries
punt building layers to Khronos github repo
Change-Id: Icf840de42856d2488a87174b2cd6c604ef8d8770
David Gross [Mon, 13 Jun 2016 18:06:24 +0000 (18:06 +0000)]
Merge \"Delete simple reduction implementation.\" into nyc-dev
am:
d749245b88
Change-Id: I1407a9a6c239d6e2d415c7e53581d4d3eb0db8fa
David Gross [Mon, 13 Jun 2016 17:58:30 +0000 (17:58 +0000)]
Merge "Delete simple reduction implementation." into nyc-dev
Daniel Nishi [Fri, 10 Jun 2016 20:51:36 +0000 (13:51 -0700)]
Add a flag to toggle how much the storage manager should retain.
This flag is used to set how many days of storage the automatic
storage manager will retain when clearing data.
Bug:
28965462
Change-Id: I87afafb7d3252d8c390ea43b7c45fd923f911e4e
Brad Ebinger [Mon, 13 Jun 2016 17:39:18 +0000 (17:39 +0000)]
Merge "Add EVENT_CALL_MERGE_FAILED Connection Event" into nyc-mr1-dev
Winson [Mon, 13 Jun 2016 17:30:33 +0000 (17:30 +0000)]
Prevent trimming recent tasks belonging in different stacks.
am:
29dbc3cc47
Change-Id: I5f87f2c865a0c5f5dad06bda895f5dd4a780d829
Doris Liu [Fri, 10 Jun 2016 21:46:43 +0000 (14:46 -0700)]
Fix setCurrentPlayTime for started but not yet pulsed animations
Also fix the behavior for calling reverse() immediately after
start(). Such case now triggers end() right away, which is
consistent with what the animation would do in M.
Bug:
29271714
Change-Id: I045e36e039179a3c462f22bc6a3a765437de4074
Winson [Wed, 8 Jun 2016 19:49:54 +0000 (12:49 -0700)]
Prevent trimming recent tasks belonging in different stacks.
- When launching an adjacent task, we usually have the same activity
not necessarily launched with MULTIPLE_TASK, so the old recent task
is incorrectly found removed.
Bug:
29121819
Change-Id: Id3bbafe0d3c535fd1a05bb373e521345c18f43d5
TreeHugger Robot [Mon, 13 Jun 2016 16:52:17 +0000 (16:52 +0000)]
Merge "Otadexopt: Expose progress percentage" into nyc-mr1-dev
Jason Monk [Mon, 13 Jun 2016 16:43:47 +0000 (12:43 -0400)]
Fix QS edit view accessibility classes
Change-Id: I6aecd900ac6123e3499ab65db8896d51b70e2f89
Fixes:
29126464
Tao Bao [Mon, 13 Jun 2016 16:43:44 +0000 (16:43 +0000)]
Merge "Add RecoverySystem.rebootWipeAb() system API." into nyc-mr1-dev
Makoto Onuki [Mon, 13 Jun 2016 16:28:31 +0000 (16:28 +0000)]
Merge "Fix some exception messages and enhance unit tets" into nyc-mr1-dev
Ricky Wai [Mon, 13 Jun 2016 14:36:45 +0000 (15:36 +0100)]
resolve merge conflicts of
6f1ed20 to nyc-mr1-dev
Change-Id: I9fe1e50f99382cbd8cd90f77ef99d081b472bb81
Paul Jensen [Mon, 13 Jun 2016 13:39:28 +0000 (09:39 -0400)]
Show sign-in to network notification to all users, not just owner.
All users should be made aware a captive portal is in place and be
given the opportunity to sign into the network. Without this fix
other users are not notified and given a chance to sign-in.
Change-Id: I1bf823d5f6a36f391dca4be5f6a584e8562a72a7
Fixes:
23079964
Ricky Wai [Mon, 13 Jun 2016 13:12:47 +0000 (13:12 +0000)]
Merge "Disable quiet mode after UserManager.trySetQuietModeDisabled() is unlocked" into nyc-dev
Tony Mak [Mon, 13 Jun 2016 12:34:42 +0000 (12:34 +0000)]
Merge \"Use startActivityDismissingKeyguard to show vpn setting page in keyguard\" into nyc-dev
am:
becebcbc6d
Change-Id: I45b9a03ad01c1f29c676d12192c57d2f249d7fea
Tony Mak [Mon, 13 Jun 2016 12:22:45 +0000 (12:22 +0000)]
Merge "Use startActivityDismissingKeyguard to show vpn setting page in keyguard" into nyc-dev
OSDN Git Service
