Bill Yi
b2cc06ea43
Import translations. DO NOT MERGE
...
am: 9ae05458f0
-s ours
Change-Id: I829586defb2cf0da3395bc8eb41ae243faf02173
2017-11-26 22:49:49 +00:00
Bill Yi
9ae05458f0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I970b01d5df730bd739ef0ad5a40d28916bf53b02
2017-11-26 12:19:05 -08:00
TreeHugger Robot
59a800d0ec
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-11-20 22:46:59 +00:00
Bill Yi
9a7789a0fc
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: ae351b3266
-s ours
Change-Id: I7004ff8745bf3ecbb1e947d5c064cca955f9e35e
2017-11-20 22:31:36 +00:00
TreeHugger Robot
ae351b3266
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-11-20 22:20:05 +00:00
Bill Yi
d4bae3a7a0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ic55e0c95b19c299b290f9f22b935b0e553917264
2017-11-20 11:40:38 -08:00
Bill Yi
c47fc92b8c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Id4c5ecbe846aca0a08b60c7a08d548cbae3458b1
2017-11-20 11:39:36 -08:00
Bill Yi
8b334cb99a
Import translations. DO NOT MERGE
...
am: fbdea47c44
-s ours
Change-Id: I791dd2ed3d53ac4230748c61169677190e143919
2017-11-15 03:37:20 +00:00
Bill Yi
fbdea47c44
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I72e5c29e7cd17ed3ee1ae77677b74ca287baa241
2017-11-14 12:42:27 -08:00
Bill Yi
cc5fd487eb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ic67e156508ed64a3ae1f26c095f72929f29e9b63
2017-11-14 12:38:18 -08:00
Ningyuan Wang
6c12f06bf8
Enforce null check for mAccessPoint
...
mAccessPoint == null implies this is a new network.
In this case, we don't need to check if it's a carrier AP.
Bug: 68846574
Test: compile, manually test that crash does not happen again.
Test: make RunSettingsRoboTests -j40 aROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I03b1da5e8f0b8e4270c0c52c67bbc90c999be078
(cherry picked from commit 0117b995f4
)
2017-11-08 18:24:48 +00:00
TreeHugger Robot
7b75c5a338
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-11-07 09:41:30 +00:00
Bill Yi
f74efef4fb
Import translations. DO NOT MERGE
...
am: 73120a4cdb
-s ours
Change-Id: Ida543e80dd13e3b5653c8676fe3032d5693a224d
2017-11-07 09:33:26 +00:00
Bill Yi
73120a4cdb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I16dfb5a1bbcd9d062c9f24914c0715c5f0cfe95e
2017-11-06 23:21:01 -08:00
Bill Yi
80f3654189
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I5e47736d365f0c8e75ec8e9ac0c84d599fbf7180
2017-11-06 23:20:38 -08:00
Fan Zhang
fbc2fd065c
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414
-s ours am: b17703e871
-s ours am: 1de093b1a1
-s ours am: 5f02135c42
-s ours am: 7690482014
-s ours am: dbbcf65c96
-s ours am: e6a8f354fc
-s ours am: 3c19043e9c
-s ours am: d15a81f882
-s ours am: e981e0b855
-s ours am: ef61a45cf6
-s ours
...
am: 5af580a419
-s ours
Change-Id: I83bbad093fdcf90649ce39efbd9783a584d2b7c1
2017-11-03 00:42:12 +00:00
Fan Zhang
5af580a419
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414
-s ours am: b17703e871
-s ours am: 1de093b1a1
-s ours am: 5f02135c42
-s ours am: 7690482014
-s ours am: dbbcf65c96
-s ours am: e6a8f354fc
-s ours am: 3c19043e9c
-s ours am: d15a81f882
-s ours am: e981e0b855
-s ours
...
am: ef61a45cf6
-s ours
Change-Id: If9d124cc6a362a152345a04e0748cd71c6fac42a
2017-11-03 00:40:07 +00:00
Fan Zhang
ef61a45cf6
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414
-s ours am: b17703e871
-s ours am: 1de093b1a1
-s ours am: 5f02135c42
-s ours am: 7690482014
-s ours am: dbbcf65c96
-s ours am: e6a8f354fc
-s ours am: 3c19043e9c
-s ours am: d15a81f882
-s ours
...
am: e981e0b855
-s ours
Change-Id: I32df0f311eca598b6b6969f288b258f65e43ae49
2017-11-03 00:38:04 +00:00
Fan Zhang
e981e0b855
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414
-s ours am: b17703e871
-s ours am: 1de093b1a1
-s ours am: 5f02135c42
-s ours am: 7690482014
-s ours am: dbbcf65c96
-s ours am: e6a8f354fc
-s ours am: 3c19043e9c
-s ours
...
am: d15a81f882
-s ours
Change-Id: I937296351e0da23f441dab7c0403b1d59d78a016
2017-11-03 00:34:29 +00:00
Fan Zhang
d15a81f882
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414
-s ours am: b17703e871
-s ours am: 1de093b1a1
-s ours am: 5f02135c42
-s ours am: 7690482014
-s ours am: dbbcf65c96
-s ours am: e6a8f354fc
-s ours
...
am: 3c19043e9c
-s ours
Change-Id: I6e25fc7111d4ec534d0588100e1dd6ce2ced5ee1
2017-11-03 00:31:01 +00:00
Fan Zhang
3c19043e9c
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414
-s ours am: b17703e871
-s ours am: 1de093b1a1
-s ours am: 5f02135c42
-s ours am: 7690482014
-s ours am: dbbcf65c96
-s ours
...
am: e6a8f354fc
-s ours
Change-Id: I4ea4b1a122429accdaede04201d88f16286fa4da
2017-11-03 00:28:34 +00:00
Fan Zhang
e6a8f354fc
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414
-s ours am: b17703e871
-s ours am: 1de093b1a1
-s ours am: 5f02135c42
-s ours am: 7690482014
-s ours
...
am: dbbcf65c96
-s ours
Change-Id: Ia7d6e53337a1b0225e8917542fa5ae9d092b1ebf
2017-11-03 00:26:03 +00:00
Fan Zhang
dbbcf65c96
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414
-s ours am: b17703e871
-s ours am: 1de093b1a1
-s ours am: 5f02135c42
-s ours
...
am: 7690482014
-s ours
Change-Id: Ia8925895580e9e010bee69ae638272ec7a9bad1a
2017-11-03 00:22:09 +00:00
Fan Zhang
7690482014
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414
-s ours am: b17703e871
-s ours am: 1de093b1a1
-s ours
...
am: 5f02135c42
-s ours
Change-Id: I97a7ff922ca6aed7f99bce5f15f104b6b7ce8411
2017-11-03 00:19:51 +00:00
Fan Zhang
5f02135c42
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414
-s ours am: b17703e871
-s ours
...
am: 1de093b1a1
-s ours
Change-Id: Ia56b40b2d0de2d993a46970d5cf1e63c8e47cd81
2017-11-03 00:17:43 +00:00
Fan Zhang
1de093b1a1
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414
-s ours
...
am: b17703e871
-s ours
Change-Id: I17c1cacc0a068c4d79e4cf568152607c3e13c4c4
2017-11-03 00:15:15 +00:00
Fan Zhang
b17703e871
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev
...
am: 1c040c7414
-s ours
Change-Id: Ibcf00afea271d12b533042711317bb2e2356c0e9
2017-11-03 00:13:11 +00:00
Fan Zhang
1c040c7414
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev
2017-11-03 00:07:32 +00:00
Fan Zhang
1aefa2529a
Set device credential's Window flag to be SECURE.
...
This prevents showing any pattern/pin in recent list.
Change-Id: I445cbad99344a2fcc335a5aad4a4de026ae97441
Merged-In: Ie56f725bf245961d61a66eae8a82b728600cb650
Fixes: 64339515
Bug: 38258991
Test: manual
2017-11-02 16:04:58 -07:00
TreeHugger Robot
e86bc950df
Merge "Check system support of wide-color" into oc-mr1-dev
2017-11-02 00:40:07 +00:00
Fan Zhang
ceeb88e6a4
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
am: b4db530aa5
-s ours am: 0c0728a947
-s ours am: 4d9e11990d
-s ours am: 3d94477fb8
-s ours am: 9d865d0c3e
-s ours am: 7da421a293
-s ours am: 76f30a360c
-s ours
...
am: 1b1204be64
-s ours
Change-Id: Ia7f4a3d972633cb1cb976550f8cbbd819a8aab3c
2017-10-31 23:18:42 +00:00
Fan Zhang
1b1204be64
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
am: b4db530aa5
-s ours am: 0c0728a947
-s ours am: 4d9e11990d
-s ours am: 3d94477fb8
-s ours am: 9d865d0c3e
-s ours am: 7da421a293
-s ours
...
am: 76f30a360c
-s ours
Change-Id: Ib2f57e3bd9adc14be453af9fc510613d210ffe23
2017-10-31 23:15:37 +00:00
Fan Zhang
76f30a360c
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
am: b4db530aa5
-s ours am: 0c0728a947
-s ours am: 4d9e11990d
-s ours am: 3d94477fb8
-s ours am: 9d865d0c3e
-s ours
...
am: 7da421a293
-s ours
Change-Id: Ia717917794165cb2846f0836c9e42350028a3095
2017-10-31 23:11:55 +00:00
Fan Zhang
7da421a293
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
am: b4db530aa5
-s ours am: 0c0728a947
-s ours am: 4d9e11990d
-s ours am: 3d94477fb8
-s ours
...
am: 9d865d0c3e
-s ours
Change-Id: Ic2de72b09edc9f4a1a2c5be6ae9b12099eb9ae62
2017-10-31 23:08:25 +00:00
Fan Zhang
9d865d0c3e
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
am: b4db530aa5
-s ours am: 0c0728a947
-s ours am: 4d9e11990d
-s ours
...
am: 3d94477fb8
-s ours
Change-Id: If5fd35415471ddb7a07899d7fff170fe63dd7dca
2017-10-31 23:04:53 +00:00
Fan Zhang
3d94477fb8
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
am: b4db530aa5
-s ours am: 0c0728a947
-s ours
...
am: 4d9e11990d
-s ours
Change-Id: Ic7eec070d6a3f352b15b6a6e9b82af93fcbf4403
2017-10-31 23:02:45 +00:00
Fan Zhang
4d9e11990d
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
am: b4db530aa5
-s ours
...
am: 0c0728a947
-s ours
Change-Id: Ia44221b7d0e556ce26b3e50a91d68b90b6453228
2017-10-31 23:00:42 +00:00
Fan Zhang
0c0728a947
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
am: 769e1e31f5
...
am: b4db530aa5
-s ours
Change-Id: Ia9e4b612cfe9efffbad24a8a123b48dbcb6bb13d
2017-10-31 22:59:07 +00:00
Fan Zhang
b4db530aa5
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08
...
am: 769e1e31f5
Change-Id: Ie3cf781e84803ef5e602e8885fe018a2bba993e4
2017-10-31 22:57:12 +00:00
Fan Zhang
769e1e31f5
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
...
am: cd66862b08
Change-Id: I46830f9d58174aafa138bee67b60e52d0578594b
2017-10-31 22:54:07 +00:00
Fan Zhang
cd66862b08
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
...
am: 8bffdc2613
Change-Id: Ie06476c8e34cbf17f4538a477894b7bca1bdfcbd
2017-10-31 22:50:43 +00:00
Fan Zhang
8bffdc2613
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
2017-10-31 22:47:13 +00:00
Fan Zhang
9c79a61f95
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
am: e79c26a9da
am: 80af194f8b
am: adabc7561b
am: 0c59dca90d
-s ours am: 96cc88e218
-s ours
...
am: 4aec1cee4e
-s ours
Change-Id: Id74bf2c46e0454e030e9fc0c4ee231450241aa79
2017-10-31 21:33:53 +00:00
Fan Zhang
4aec1cee4e
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
am: e79c26a9da
am: 80af194f8b
am: adabc7561b
am: 0c59dca90d
-s ours
...
am: 96cc88e218
-s ours
Change-Id: Ic182e3df1a283123d0d53c13499af1ed7501767e
2017-10-31 21:29:53 +00:00
Fan Zhang
96cc88e218
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
am: e79c26a9da
am: 80af194f8b
am: adabc7561b
...
am: 0c59dca90d
-s ours
Change-Id: I10ea3abe4e4a04fa779cd51cee141cb80cb76acf
2017-10-31 21:25:58 +00:00
Fan Zhang
0c59dca90d
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
am: e79c26a9da
am: 80af194f8b
...
am: adabc7561b
Change-Id: I58bf359a98fc0b6ceb06cf4a5e83cedabfa6a0f3
2017-10-31 21:23:57 +00:00
Fan Zhang
adabc7561b
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
am: e79c26a9da
...
am: 80af194f8b
Change-Id: Iecfc5f05f9ede225800d12416508d71f7aeb46c0
2017-10-31 21:21:53 +00:00
Fan Zhang
80af194f8b
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
...
am: e79c26a9da
Change-Id: I3652f6f77479a339b9acc387a49ee96fe70921ff
2017-10-31 21:16:32 +00:00
Fan Zhang
e79c26a9da
Merge "Set device credential's Window flag to be SECURE." into nyc-dev
...
am: e69c4dcb8f
Change-Id: I30a0d2578343a7635da63a52cfc81f1427aab23b
2017-10-31 21:11:26 +00:00
Fan Zhang
5c1a1363c7
Set device credential's Window flag to be SECURE.
...
This prevents showing any pattern/pin in recent list.
Change-Id: Ie56f725bf245961d61a66eae8a82b728600cb650
Fixes: 64339515
Bug: 38258991
Merged-In: Ife33131004d66092bfa57aa57a9bb856800ce28d
Merged-In: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Merged-In: Ibe781a3a1e1483a8c6fde4c7cc5dffbf54bdba59
Test: manual
2017-10-31 21:03:52 +00:00