OSDN Git Service
Jason Monk [Wed, 20 Jul 2016 15:53:11 +0000 (15:53 +0000)]
Merge \"QS: Fix crash in tile API\" into nyc-mr1-dev
am:
77d8771b30
Change-Id: I6669e736208ada6ebd5bd2fc9e0466f924bffd6a
TreeHugger Robot [Wed, 20 Jul 2016 15:44:18 +0000 (15:44 +0000)]
Merge "QS: Fix crash in tile API" into nyc-mr1-dev
Jason Monk [Wed, 20 Jul 2016 14:18:09 +0000 (10:18 -0400)]
QS: Fix crash in tile API
Change-Id: I9062839ab59236c20e35645701254ea2d24cc876
Fixes:
30224352
Android Build Merger (Role) [Wed, 20 Jul 2016 03:30:45 +0000 (03:30 +0000)]
Merge "Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7 am:
a20314a28e am:
a71fe00594 am:
9fd8d75ebc" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 20 Jul 2016 03:30:29 +0000 (03:30 +0000)]
Merge "Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a am:
6b05e285cc am:
47e801972c am:
51bb81b46e" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 20 Jul 2016 03:30:14 +0000 (03:30 +0000)]
Merge "WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3 am:
eef477c8b9 am:
cf3595400b -s ours am:
d77404a0e5 am:
15058ed5e2" into nyc-mr1-dev-plus-aosp
Paul Stewart [Wed, 20 Jul 2016 03:29:44 +0000 (03:29 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7 am:
a20314a28e am:
a71fe00594
am:
9fd8d75ebc
Change-Id: I1131987821d39b09c63e58d2d8b8d9054ba18b4d
Paul Stewart [Wed, 20 Jul 2016 03:29:40 +0000 (03:29 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a am:
6b05e285cc am:
47e801972c
am:
51bb81b46e
Change-Id: If9b2adc6ff344f48850681443b96040937ad8318
Paul Stewart [Wed, 20 Jul 2016 03:29:36 +0000 (03:29 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3 am:
eef477c8b9 am:
cf3595400b -s ours am:
d77404a0e5
am:
15058ed5e2
Change-Id: I5d98afec8b64cdfab8c063b471231788549a610f
Paul Stewart [Wed, 20 Jul 2016 03:28:56 +0000 (03:28 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7 am:
a20314a28e am:
a71fe00594
am:
a7aa029132
Change-Id: I8be18009c923720b0092fe9799c4b90475338083
Paul Stewart [Wed, 20 Jul 2016 03:28:54 +0000 (03:28 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a am:
6b05e285cc am:
47e801972c
am:
756def010b
Change-Id: Iec2035be7a4484eee986e879185fff8cb3f5e7c5
Paul Stewart [Wed, 20 Jul 2016 03:28:51 +0000 (03:28 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3 am:
eef477c8b9 am:
cf3595400b -s ours am:
d77404a0e5
am:
371aa0d792
Change-Id: I7d6ae5696dff58bfd6d737e885d03b73031c790a
Paul Stewart [Wed, 20 Jul 2016 03:23:13 +0000 (03:23 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7 am:
a20314a28e
am:
a71fe00594
Change-Id: I93d600fe926037601f367697dd6f30f3ddca5e69
Paul Stewart [Wed, 20 Jul 2016 03:23:11 +0000 (03:23 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7 am:
a20314a28e
am:
a71fe00594
Change-Id: I413208f7d9a86902f6159d115d90817ba3929a53
Paul Stewart [Wed, 20 Jul 2016 03:23:10 +0000 (03:23 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a am:
6b05e285cc
am:
47e801972c
Change-Id: Ib1ffaf10f47884fe64660ad5266d0057affe920c
Paul Stewart [Wed, 20 Jul 2016 03:23:09 +0000 (03:23 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a am:
6b05e285cc
am:
47e801972c
Change-Id: Iea3e559cc86c3ff89b0165ef4479a31c6e4980c4
Paul Stewart [Wed, 20 Jul 2016 03:23:07 +0000 (03:23 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3 am:
eef477c8b9 am:
cf3595400b -s ours
am:
d77404a0e5
Change-Id: Ic99eff4cab95c24391b66f62e307dcb5cfbde823
Paul Stewart [Wed, 20 Jul 2016 03:23:05 +0000 (03:23 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3 am:
eef477c8b9 am:
cf3595400b -s ours
am:
d77404a0e5
Change-Id: Ic7d1e557c9b1c0eb2d3cd18c1c7b8055638d1c3e
Paul Stewart [Wed, 20 Jul 2016 03:17:07 +0000 (03:17 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7
am:
a20314a28e
Change-Id: I54f5b652c5c5bc148a8058cea665aab5327c61ab
Paul Stewart [Wed, 20 Jul 2016 03:17:01 +0000 (03:17 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a
am:
6b05e285cc
Change-Id: I85e36294bd68be5da928d96dd7d9742f7fba53d3
Paul Stewart [Wed, 20 Jul 2016 03:16:50 +0000 (03:16 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3 am:
eef477c8b9
am:
cf3595400b -s ours
Change-Id: I983c0d096671d522f3eed3eb3deacff300b50bb9
Android Build Merger (Role) [Wed, 20 Jul 2016 01:36:41 +0000 (01:36 +0000)]
Merge "Merge \\\\\\"docs: Updated descriptions of device orientation angles.\\\\\\" into mnc-docs am:
d312201b74 am:
6b4d2a2e6d am:
a812012c52 am:
b9487874fe am:
55b52a2b3f am:
b73cdcefcc" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Wed, 20 Jul 2016 01:36:22 +0000 (01:36 +0000)]
Merge \\\\\\"docs: Updated descriptions of device orientation angles.\\\\\\" into mnc-docs am:
d312201b74 am:
6b4d2a2e6d am:
a812012c52 am:
b9487874fe am:
55b52a2b3f
am:
b73cdcefcc
Change-Id: If11f3825cc3677b2976e6a253aa77b6e86e218dd
Kevin Hufnagle [Wed, 20 Jul 2016 01:35:56 +0000 (01:35 +0000)]
Merge \\\\\\"docs: Updated descriptions of device orientation angles.\\\\\\" into mnc-docs am:
d312201b74 am:
6b4d2a2e6d am:
a812012c52 am:
b9487874fe am:
55b52a2b3f
am:
87a8e5eebd
Change-Id: I946cd3820608cd6f33f62abd397cda51138a17d2
Paul Stewart [Wed, 20 Jul 2016 01:35:14 +0000 (01:35 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165
am:
2331eefef7
Change-Id: Ia0cccdca5f4e44ad4caf75240240eec73757e22b
Paul Stewart [Wed, 20 Jul 2016 01:35:10 +0000 (01:35 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437
am:
537535c14a
Change-Id: I0f9c27f32518f9c7bb1d3735741843178fc1dc02
Kevin Hufnagle [Wed, 20 Jul 2016 01:29:00 +0000 (01:29 +0000)]
Merge \\\\\"docs: Updated descriptions of device orientation angles.\\\\\" into mnc-docs am:
d312201b74 am:
6b4d2a2e6d am:
a812012c52 am:
b9487874fe
am:
55b52a2b3f
Change-Id: Ib14b352efe5f10043b092e234a2b92f2c2aa2bc2
Kevin Hufnagle [Wed, 20 Jul 2016 01:28:59 +0000 (01:28 +0000)]
Merge \\\\\"docs: Updated descriptions of device orientation angles.\\\\\" into mnc-docs am:
d312201b74 am:
6b4d2a2e6d am:
a812012c52 am:
b9487874fe
am:
55b52a2b3f
Change-Id: I8c9a6fe4778a3344e8c6270f865567ba4bf05dbb
Paul Stewart [Wed, 20 Jul 2016 01:28:54 +0000 (01:28 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac
am:
a09b6ee165
Change-Id: I63a60f729f95f273bf1918689626ac83771c73ac
Paul Stewart [Wed, 20 Jul 2016 01:28:52 +0000 (01:28 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3
am:
b3ff6b4437
Change-Id: I51e07e2ab6b3bee89dada0b6bf1ce1bf52f78d2f
Paul Stewart [Wed, 20 Jul 2016 01:28:32 +0000 (01:28 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3
am:
eef477c8b9
Change-Id: I38649e47184a6b34a923037922fb6743f14fb6e1
Kevin Hufnagle [Wed, 20 Jul 2016 01:20:20 +0000 (01:20 +0000)]
Merge \\\\"docs: Updated descriptions of device orientation angles.\\\\" into mnc-docs am:
d312201b74 am:
6b4d2a2e6d am:
a812012c52
am:
b9487874fe
Change-Id: I034ce5c4a115fa4b694569c66a7e764543191cf7
Paul Stewart [Wed, 20 Jul 2016 01:20:08 +0000 (01:20 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e
am:
c77f18b2a3
Change-Id: Id93c8ac53a78931c8fdba21b7c168e38a7ad7fe4
Paul Stewart [Wed, 20 Jul 2016 01:19:50 +0000 (01:19 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e
am:
1e9889d5ac
Change-Id: Ie0bfc4653bfe90335952110b38be2eeee418f98f
Paul Stewart [Wed, 20 Jul 2016 01:19:46 +0000 (01:19 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994
am:
f8d4c187a3
Change-Id: If6d30364da0246233415bc15a1dda7c297f7bf6b
Kevin Hufnagle [Wed, 20 Jul 2016 01:12:40 +0000 (01:12 +0000)]
Merge \\\"docs: Updated descriptions of device orientation angles.\\\" into mnc-docs am:
d312201b74 am:
6b4d2a2e6d
am:
a812012c52
Change-Id: Ifff8f0ca783a601dab3b4968a0e9708e34aa83f4
Svetoslav Ganov [Wed, 20 Jul 2016 01:12:15 +0000 (01:12 +0000)]
Merge \"Revert \"Prevent apps to overlay other apps via toast windows\"\" into nyc-mr1-dev
am:
78fa7a1b3f
Change-Id: I30b84189b2c2c4566c837cd1b8837053d6944988
Paul Stewart [Wed, 20 Jul 2016 01:12:15 +0000 (01:12 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1
am:
0f9a968c0e
Change-Id: I5ef9b70287cd8b0beaa169f194e7011b8c354454
Paul Stewart [Wed, 20 Jul 2016 01:12:11 +0000 (01:12 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772
am:
6245774994
Change-Id: Ib82209c5c6b71f3c47feaa17c346f853288b0131
Paul Stewart [Wed, 20 Jul 2016 01:11:49 +0000 (01:11 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6
am:
d78a14531e
Change-Id: Id37927594f47a5a32b05b15c8e09df0fa4ea9569
Justin Klaassen [Wed, 20 Jul 2016 01:06:36 +0000 (01:06 +0000)]
Merge \"Add SETTINGS_CONDITION_NIGHT_DISPLAY\" into nyc-mr1-dev
am:
1e6e1ffeaa
Change-Id: I0204b25d35585c39ebea8ab797f00e1c027b86c5
Jack Yu [Wed, 20 Jul 2016 01:06:25 +0000 (01:06 +0000)]
Merge \"Made severe and extreme alert configuration dependency configurable\" into nyc-mr1-dev
am:
338566df68
Change-Id: I90c0669c74e15d92d00a639ad444866142a62c2e
Christopher Tate [Wed, 20 Jul 2016 01:06:19 +0000 (01:06 +0000)]
Merge \"Remove scheduled jobs when an app is force-stopped\" into nyc-mr1-dev
am:
5b3304387a
Change-Id: Ibddc2496e4aa33ec5c8a34cc3f99b0a722146422
Svetoslav Ganov [Wed, 20 Jul 2016 01:04:51 +0000 (01:04 +0000)]
Merge "Revert "Prevent apps to overlay other apps via toast windows"" into nyc-mr1-dev
Kevin Hufnagle [Wed, 20 Jul 2016 01:02:28 +0000 (01:02 +0000)]
Merge \\"docs: Updated descriptions of device orientation angles.\\" into mnc-docs am:
d312201b74
am:
6b4d2a2e6d
Change-Id: Idffebefeb70955553bf7539e1e225935cf57e82c
Paul Stewart [Wed, 20 Jul 2016 01:01:15 +0000 (01:01 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee
am:
701a6c1ed6
Change-Id: I34acfe2e2ab1da2615f5a7107a9879e7491b0857
Svetoslav Ganov [Wed, 20 Jul 2016 01:00:51 +0000 (01:00 +0000)]
Revert "Prevent apps to overlay other apps via toast windows"
This reverts commit
b3b22cba86dd6e010c5fac3d044990f155a33381.
Change-Id: I905e7435893fab49f03fdb708f4ab5a9d2c9cbae
TreeHugger Robot [Wed, 20 Jul 2016 01:00:23 +0000 (01:00 +0000)]
Merge "Add SETTINGS_CONDITION_NIGHT_DISPLAY" into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 00:57:50 +0000 (00:57 +0000)]
Merge "Made severe and extreme alert configuration dependency configurable" into nyc-mr1-dev
Chris Tate [Wed, 20 Jul 2016 00:56:50 +0000 (00:56 +0000)]
Merge "Remove scheduled jobs when an app is force-stopped" into nyc-mr1-dev
Kevin Hufnagle [Wed, 20 Jul 2016 00:56:28 +0000 (00:56 +0000)]
Merge \"docs: Updated descriptions of device orientation angles.\" into mnc-docs
am:
d312201b74
Change-Id: Idfe0c0ec38bd33d64f5b8be602d24aec778fac09
Paul Stewart [Wed, 20 Jul 2016 00:54:33 +0000 (00:54 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b
am:
bb7439d8a1
Change-Id: I0aa11cbba826189e7e5e4e9196654c4f43157de0
Paul Stewart [Wed, 20 Jul 2016 00:54:27 +0000 (00:54 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d
am:
5d60d2f772
Change-Id: I1a0651d22571a4dec3b4b6ca97f6b62b930f1cc7
Paul Stewart [Wed, 20 Jul 2016 00:54:20 +0000 (00:54 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4
am:
e41e0064ee
Change-Id: I9582c9327b859c981cb75d6aad52bb5dd1fafe20
Kevin Hufnagle [Wed, 20 Jul 2016 00:45:08 +0000 (00:45 +0000)]
Merge "docs: Updated descriptions of device orientation angles." into mnc-docs
Paul Stewart [Wed, 20 Jul 2016 00:45:09 +0000 (00:45 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26
am:
c92e93c47b
Change-Id: I50ca54dc65b61cb2dbb550eb964bd50938595168
Paul Stewart [Wed, 20 Jul 2016 00:45:07 +0000 (00:45 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b
am:
700c72d01d
Change-Id: I6fc08163a75790e15d05ab952ad4e706a1391916
Paul Stewart [Wed, 20 Jul 2016 00:45:04 +0000 (00:45 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103
am:
e2a03026c4
Change-Id: Iba16c43199d5ab238ce129d37519f9c5a7ba2005
Paul Stewart [Wed, 20 Jul 2016 00:37:53 +0000 (00:37 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891
am:
2e85e2ef26
Change-Id: If8a2f4e1fcbb4adf6e2ddef438781fb83de04cc3
Paul Stewart [Wed, 20 Jul 2016 00:37:50 +0000 (00:37 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4
am:
bf4f010a5b
Change-Id: I7e57c484be20197748c40c80acd987802b43a734
Paul Stewart [Wed, 20 Jul 2016 00:37:44 +0000 (00:37 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9
am:
141477b103
Change-Id: Ie4c9d06d225a2b99ebb4411e4282ea792c67d26b
Steve McKay [Wed, 20 Jul 2016 00:32:14 +0000 (00:32 +0000)]
Merge \"Make the app name \"Files\" instead of Documents.\" into nyc-mr1-dev
am:
6aa504077d
Change-Id: Ifd6e962abbcc2fb71bb1cc3239a96d8d9e027dba
Paul Stewart [Wed, 20 Jul 2016 00:31:29 +0000 (00:31 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28
am:
58555ee891
Change-Id: I1032efe65d45995a79572f669cddc5a4cf6131d9
Paul Stewart [Wed, 20 Jul 2016 00:31:22 +0000 (00:31 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf
am:
3fbe9280a4
Change-Id: Ib3bea7489d319bb94a41f3c8cb0d8ec7e40b14b7
Paul Stewart [Wed, 20 Jul 2016 00:31:15 +0000 (00:31 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6
am:
df93deccf9
Change-Id: Iaeae846189a8f5fa38c5da988eec7879300f8ab5
Christopher Tate [Fri, 15 Jul 2016 23:56:56 +0000 (16:56 -0700)]
Remove scheduled jobs when an app is force-stopped
Bug
30100499
Change-Id: Id98a2fe68c07aa9e4557685d3653954d02b71d0a
Paul Stewart [Wed, 20 Jul 2016 00:25:20 +0000 (00:25 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229
am:
2169197e28
Change-Id: I24f2c9f59336454aa071acca44d6aca5b44fda4a
Paul Stewart [Wed, 20 Jul 2016 00:25:17 +0000 (00:25 +0000)]
Fix string equality comparison am:
1033c6fdbc
am:
fdd4fe53cf
Change-Id: Id179c734fc503abea1216e7c6057d4903a17f340
Paul Stewart [Wed, 20 Jul 2016 00:25:14 +0000 (00:25 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646
am:
fa4bbf4ad6
Change-Id: I3ec1ff70fdfc2fd2aabf22ad1b7b3dad27ad4674
Makoto Onuki [Wed, 20 Jul 2016 00:24:42 +0000 (00:24 +0000)]
Merge \"Stop adding FLAG_ACTIVITY_RESET_TASK_IF_NEEDED when...\" into nyc-mr1-dev
am:
ceadb1a86a
Change-Id: If26f5a2e8f2a0533b145025734e5819e72a48b28
Paul Stewart [Wed, 20 Jul 2016 00:17:49 +0000 (00:17 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev
am:
77b5526229
Change-Id: I07fc88a342c3c6d1594832d0a05dd0734eb48424
Paul Stewart [Wed, 20 Jul 2016 00:17:47 +0000 (00:17 +0000)]
Fix string equality comparison
am:
1033c6fdbc
Change-Id: I6503cb15fdc0741b6c6c2da9ee14057265f87545
Paul Stewart [Wed, 20 Jul 2016 00:17:43 +0000 (00:17 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString
am:
cc00f4d646
Change-Id: Iece2fd19363a3524746b01cf388566363d678431
Steve McKay [Wed, 20 Jul 2016 00:10:35 +0000 (00:10 +0000)]
Merge "Make the app name "Files" instead of Documents." into nyc-mr1-dev
Pirama Arumuga Nainar [Tue, 19 Jul 2016 23:59:37 +0000 (23:59 +0000)]
Merge \\\"Disable warning triggered in Clang r271374\\\" am:
bba87840d3 am:
4643acaa34
am:
46b64ae00e
Change-Id: If4fb63fc20ba9cd10bd10c8255f2275a29477801
Paul Stewart [Tue, 19 Jul 2016 23:58:59 +0000 (23:58 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev
* changes:
Fix string equality comparison
WifiEnterpriseConfiguration: Do not print credentials in toString
Makoto Onuki [Tue, 19 Jul 2016 23:57:30 +0000 (23:57 +0000)]
Merge "Stop adding FLAG_ACTIVITY_RESET_TASK_IF_NEEDED when..." into nyc-mr1-dev
Stephen Hines [Tue, 19 Jul 2016 23:52:00 +0000 (23:52 +0000)]
Merge \\"Disable warning triggered in Clang r271374\\" am:
bba87840d3
am:
4643acaa34
Change-Id: Ie8f5bcee02f0235d06f7b0f5b11efd592026fce1
Selim Cinek [Tue, 19 Jul 2016 23:50:37 +0000 (23:50 +0000)]
Merge \"Changed to vibrate on down instead of up when entering pin\" into nyc-mr1-dev
am:
798d69817d
Change-Id: Ic940aa6733ddf9e7415f9ae43b849ae2c2c06cd0
TreeHugger Robot [Tue, 19 Jul 2016 23:47:33 +0000 (23:47 +0000)]
Merge "Changed to vibrate on down instead of up when entering pin" into nyc-mr1-dev
Pirama Arumuga Nainar [Tue, 19 Jul 2016 23:41:20 +0000 (23:41 +0000)]
Merge \"Disable warning triggered in Clang r271374\"
am:
bba87840d3
Change-Id: I03686c2e9c341d927b295c150aea8eea37f69338
Justin Klaassen [Tue, 19 Jul 2016 23:31:24 +0000 (23:31 +0000)]
Merge \"Animate Night display transition\" into nyc-mr1-dev
am:
5c0ea3b5f4
Change-Id: I423226e374fc3aed4d15db6a3b8424597d28794f
TreeHugger Robot [Tue, 19 Jul 2016 23:25:58 +0000 (23:25 +0000)]
Merge "Animate Night display transition" into nyc-mr1-dev
Youhan Wang [Tue, 19 Jul 2016 23:10:27 +0000 (23:10 +0000)]
Merge \"Add getCdmaPrlVersion().\" into nyc-mr1-dev
am:
d71c64f715
Change-Id: I4c558086089b69c529019c9712e1fa2424a63e35
Teng-Hui Zhu [Tue, 19 Jul 2016 23:04:14 +0000 (23:04 +0000)]
Merge \"Use a round rect background drawable for \"clear all\"\" into nyc-mr1-dev
am:
b8292a6401
Change-Id: I2201774012da04b8920e298899329af8339452f0
Youhan Wang [Tue, 19 Jul 2016 22:59:08 +0000 (22:59 +0000)]
Merge "Add getCdmaPrlVersion()." into nyc-mr1-dev
Tenghui Zhu [Tue, 19 Jul 2016 22:56:58 +0000 (22:56 +0000)]
Merge "Use a round rect background drawable for "clear all"" into nyc-mr1-dev
Hall Liu [Tue, 19 Jul 2016 22:30:31 +0000 (22:30 +0000)]
Merge \"Add carrier config keys for disabling HD icon\" into nyc-mr1-dev
am:
9adea2e246
Change-Id: I1a43d0e6738a41860078ee710d5b57f9a9e66cd5
Teng-Hui Zhu [Tue, 19 Jul 2016 22:14:13 +0000 (15:14 -0700)]
Use a round rect background drawable for "clear all"
Such that we can remove the outline clip, which is triggering a new shader
compilation when "clear all" show up the first time.
b/
28795315
Change-Id: Ib3c4283e46c932090ec97233a5551da7b359c8c8
Hall Liu [Tue, 19 Jul 2016 22:23:05 +0000 (22:23 +0000)]
Merge "Add carrier config keys for disabling HD icon" into nyc-mr1-dev
Jack Yu [Tue, 19 Jul 2016 22:20:06 +0000 (15:20 -0700)]
Made severe and extreme alert configuration dependency configurable
Before when extreme alert is disabled, severe alert will be disabled
by default because we assume users won't be interested in severe
alert if he is even not interested in extreme (higher level) alert.
Now carriers are allowed to turn this feature off by carrier config.
bug:
29369591
Change-Id: I3eb8a0c3e2df420ea75a77ec01cc447013434219
Selim Cinek [Tue, 19 Jul 2016 22:18:30 +0000 (15:18 -0700)]
Changed to vibrate on down instead of up when entering pin
Change-Id: I180e67e65fa3b1230bd1737abf2f0605a254d348
Fixes:
30000347
Stephen Hines [Tue, 19 Jul 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Disable warning triggered in Clang r271374"
Andrew Sapperstein [Tue, 19 Jul 2016 21:52:34 +0000 (21:52 +0000)]
Merge \"Add new DeviceDefault.Light.Voice theme.\" into nyc-mr1-dev
am:
d7a59636b7
Change-Id: Ib920e93d640f616e44e2288f63ce18d817abaec0
Ecco Park [Tue, 19 Jul 2016 21:46:59 +0000 (21:46 +0000)]
Merge \"GPS: Keep LPP_PROFILE for verizon\" into nyc-mr1-dev
am:
f308636e22
Change-Id: I90b01d784332c54b125dd6510a367e62b207d8e8
Andrew Sapperstein [Tue, 19 Jul 2016 21:42:25 +0000 (21:42 +0000)]
Merge "Add new DeviceDefault.Light.Voice theme." into nyc-mr1-dev
Ecco Park [Tue, 19 Jul 2016 21:37:05 +0000 (21:37 +0000)]
Merge "GPS: Keep LPP_PROFILE for verizon" into nyc-mr1-dev
Justin Klaassen [Tue, 19 Jul 2016 04:38:24 +0000 (21:38 -0700)]
Add SETTINGS_CONDITION_NIGHT_DISPLAY
Bug:
30043281
Change-Id: Icf218a8fdc7421620d2bb6057b55f1d511621b8b
Justin Klaassen [Fri, 15 Jul 2016 04:00:06 +0000 (21:00 -0700)]
Animate Night display transition
Bug:
30130457
Change-Id: I9d50cb432e6214d6abee6b4cf8c8ac1ff8a1cf6e
Ecco Park [Mon, 18 Jul 2016 21:08:05 +0000 (14:08 -0700)]
GPS: Keep LPP_PROFILE for verizon
1) add isVerizon function to check verizon sim
2) Save the LPP_PROFILE into property when inserting verizon sim.
3) Use this Profile if device is rebooted after removing this sim.
4) This behavior is maintained unless non-verizon sim is inserted
Bug:
24860255
Change-Id: I3633e1adbbf35852f508877255d3f1664e5497f0
Signed-off-by: Ecco Park <eccopark@google.com>