OSDN Git Service
Antony Sargent [Fri, 1 Dec 2017 21:26:05 +0000 (21:26 +0000)]
Fix BluetoothPairingDialogTest to not expect device name am:
f20e0a492b am:
0ceadf9fb8
am:
4b47184df3
Change-Id: Id5e9801e9fcea4e8395f3406b94d3790c0ab27be
Antony Sargent [Fri, 1 Dec 2017 21:23:59 +0000 (21:23 +0000)]
Fix BluetoothPairingDialogTest to not expect device name am:
f20e0a492b
am:
0ceadf9fb8
Change-Id: I2d48521b73bb75fbbc92c54ff353ec491397f81c
Antony Sargent [Fri, 1 Dec 2017 21:21:38 +0000 (21:21 +0000)]
Fix BluetoothPairingDialogTest to not expect device name
am:
f20e0a492b
Change-Id: I4a74ac865db27415b232b0f460b058344adcc0ce
Bill Yi [Thu, 30 Nov 2017 23:01:17 +0000 (23:01 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
ec4fe2a0c6 -s ours
Change-Id: I8979949845d4722a448047f31beb6fa11ff60434
TreeHugger Robot [Thu, 30 Nov 2017 20:59:07 +0000 (20:59 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Hemant Gupta [Thu, 30 Nov 2017 17:43:08 +0000 (17:43 +0000)]
Merge "Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE" am:
b21a10b2ff
am:
a84a535729
Change-Id: Ia8ed56e2da6641a107af912efdf497d90c0d43ed
Hemant Gupta [Thu, 30 Nov 2017 17:40:31 +0000 (17:40 +0000)]
Merge "Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE"
am:
b21a10b2ff
Change-Id: Id0378b1c410afcc0566652e3308cd812dcd68470
Treehugger Robot [Thu, 30 Nov 2017 17:38:01 +0000 (17:38 +0000)]
Merge "Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE"
Bill Yi [Thu, 30 Nov 2017 12:05:41 +0000 (04:05 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
69925163
Change-Id: I4c880093e20e7178ce80006b158fefd490b4e061
Hemant Gupta [Fri, 22 Sep 2017 06:54:14 +0000 (12:24 +0530)]
Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE
Step by step:
1. Pair and connect with BTHS (e.g. SBH50).
2. Click the settings icon of paired device, and check "Use for" items.
-----------------------------------------------------------------
Expected Result:
After step 2, "Contact sharing" should not be checked.
Actual Result:
After step 2, "Contact sharing" is checked.
Fix:
Set phone book permission as REJECTED if class of Device is
not AUDIO_VIDEO_HANDSFREE
Test: Checked above usecase and issue is not observed
Bug:
64372703
Change-Id: I178a09dd9e76d67c461c4b04d9b2ee0078ed24c9
Malcolm Chen [Wed, 29 Nov 2017 00:36:54 +0000 (00:36 +0000)]
Merge "Remove extra newline in AndroidManifest." am:
8aeb69396d
am:
9d30592308
Change-Id: I2b4480c0d1a98ce4bb87d6fa30f347b929703fe9
Malcolm Chen [Wed, 29 Nov 2017 00:31:49 +0000 (00:31 +0000)]
Merge "Remove extra newline in AndroidManifest."
am:
8aeb69396d
Change-Id: I36ea57db56ff985da118fb7ab117bf939b7b2dc1
Treehugger Robot [Wed, 29 Nov 2017 00:22:47 +0000 (00:22 +0000)]
Merge "Remove extra newline in AndroidManifest."
Bill Yi [Sun, 26 Nov 2017 23:05:52 +0000 (23:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
419407eaea -s ours
Change-Id: I5689ca60c3bf9a29c59380c7d3002c6007f8eb05
TreeHugger Robot [Sun, 26 Nov 2017 23:02:14 +0000 (23:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sun, 26 Nov 2017 22:52:50 +0000 (22:52 +0000)]
Import translations. DO NOT MERGE am:
9ae05458f0 -s ours
am:
b2cc06ea43 -s ours
Change-Id: I6e6335049140a4cb73bb694dd4636f264e1876a4
Bill Yi [Sun, 26 Nov 2017 22:49:49 +0000 (22:49 +0000)]
Import translations. DO NOT MERGE
am:
9ae05458f0 -s ours
Change-Id: I829586defb2cf0da3395bc8eb41ae243faf02173
Bill Yi [Sun, 26 Nov 2017 20:19:05 +0000 (12:19 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I970b01d5df730bd739ef0ad5a40d28916bf53b02
Bill Yi [Sun, 26 Nov 2017 20:15:58 +0000 (12:15 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ibfb674f157b342ea77c07cd88c47dc25b2fcd03e
songkailun [Wed, 22 Nov 2017 18:57:13 +0000 (18:57 +0000)]
Merge "DO NOT MERGE translate arrays in Settings/res" am:
992a4e5500 -s ours
am:
94cd0e4373
Change-Id: I8c60234d38a9aedd6b2bec24ff053aa2049790bd
songkailun [Wed, 22 Nov 2017 18:49:59 +0000 (18:49 +0000)]
Merge "DO NOT MERGE translate arrays in Settings/res"
am:
992a4e5500 -s ours
Change-Id: Ia5c69f39d1796acd79e453744cc7e5c487c43042
Treehugger Robot [Wed, 22 Nov 2017 18:36:14 +0000 (18:36 +0000)]
Merge "DO NOT MERGE translate arrays in Settings/res"
songkailun [Tue, 14 Nov 2017 13:57:20 +0000 (21:57 +0800)]
DO NOT MERGE translate arrays in Settings/res
"None" should be translated
Change-Id: I12a30e6476ec41c2a3bf1878d6b5596bf5ee8ed7
Signed-off-by: songkailun <songkailun@xiaomi.com>
Malcolm Chen [Fri, 14 Jul 2017 00:59:58 +0000 (17:59 -0700)]
Remove extra newline in AndroidManifest.
Remove extra newline in AndroidManifest which caused
android.settings.MOBILE_DATA_USAGE not received.
Bug: b/
63670955
Test: testcase MobileDataUsageActivityTest
Change-Id: I4a4178141010b128e3d9c8c9721a51b81cbdffff
jackqdyulei [Tue, 21 Nov 2017 16:46:24 +0000 (16:46 +0000)]
Merge "Add owners to setting packages." am:
f82cd59476
am:
e6f052e928
Change-Id: Ie9bcc92888073e504ac444c42bc801c50aac7eb5
jackqdyulei [Tue, 21 Nov 2017 16:41:50 +0000 (16:41 +0000)]
Merge "Add owners to setting packages."
am:
f82cd59476
Change-Id: Ic7c94f6ba65149cdc799332a0cc5976ff285f16f
Treehugger Robot [Tue, 21 Nov 2017 16:35:30 +0000 (16:35 +0000)]
Merge "Add owners to setting packages."
Malcolm Chen [Tue, 21 Nov 2017 00:58:56 +0000 (00:58 +0000)]
Merge "Add an activity that starts DataUsageList fragment for mobile." am:
942d418da9 -s ours
am:
5b59b71f12 -s ours
Change-Id: I236ee8d17bef986af509692cbbd5788ab653d3ae
Malcolm Chen [Tue, 21 Nov 2017 00:48:50 +0000 (00:48 +0000)]
Merge "Add an activity that starts DataUsageList fragment for mobile."
am:
942d418da9 -s ours
Change-Id: I23e52f28f5e0873094476eda4698677e4c736f4e
jackqdyulei [Mon, 11 Sep 2017 19:44:27 +0000 (12:44 -0700)]
Add owners to setting packages.
Bug:
65294119
Fixes:
69384604
Test: Build
Change-Id: Ib4fddc1f04087671d8445fd967d4262287e5c4f3
Merged-In: I927052a73f639d0894600611cd5c79293f43ff5e
Merged-In: Ia1eb8155f2d4359d56b0babd474083295ba38a0b
Merged-In: I24ec103ff5013ad416e3dfb1c548acd387b4ba64
Merged-In: If9fddc8b4e2e6d4d7db185ab16063e824323b9a7
Merged-In: I49159950521a013422b1087ea2c3e6cd5151457c
Merged-In: I69af58183c5b89af96c1a8808665fa506a620012
Merged-In: Ie9492f497824cd2b2727dde9d3a48452c72f1084
Merged-In: I2fd0249fd8b555e5ca93c3aec13857e6c74e157c
Merged-In: Id1c2d9233643a18c1e104255a9e2b8b1aaefc44e
Merged-In: Icdcfaaf6cc7a1e1cf77e89a79d0425cab4405ffc
Merged-In: I697528ff260a0f8e54aa1188e35143e668800e7d
Merged-In: I1486782f476acaf1e2e4b66df57869409239986f
Merged-In: I804b50a38c877da80b5ef3251e16029259014152
Merged-In: I39eec9ebc1db2dc14669f27b17624394e25eb47f
Merged-In: I054a6df08046cda1c2f202390ed24839a6b10349
Merged-In: I9da5bd71ed6aa3922a7f2e2ac4729e3247a204ce
Merged-In: I63778c68f1ab9edc36a9e12aa1729f8fd6a5e073
Treehugger Robot [Tue, 21 Nov 2017 00:35:41 +0000 (00:35 +0000)]
Merge "Add an activity that starts DataUsageList fragment for mobile."
Bill Yi [Mon, 20 Nov 2017 22:53:31 +0000 (22:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
59a800d0ec -s ours
Change-Id: I1a74337f7fb7ac6d5b157f5a8baa62d0703e2ec4
TreeHugger Robot [Mon, 20 Nov 2017 22:46:59 +0000 (22:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Mon, 20 Nov 2017 22:36:07 +0000 (22:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
ae351b3266 -s ours
am:
9a7789a0fc -s ours
Change-Id: I26f441bc84359e2ef490cc70867ee1b738ec85d8
Bill Yi [Mon, 20 Nov 2017 22:31:36 +0000 (22:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
ae351b3266 -s ours
Change-Id: I7004ff8745bf3ecbb1e947d5c064cca955f9e35e
TreeHugger Robot [Mon, 20 Nov 2017 22:20:05 +0000 (22:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Mon, 20 Nov 2017 19:40:38 +0000 (11:40 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic55e0c95b19c299b290f9f22b935b0e553917264
Bill Yi [Mon, 20 Nov 2017 19:39:36 +0000 (11:39 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id4c5ecbe846aca0a08b60c7a08d548cbae3458b1
Jie Cheng [Thu, 16 Nov 2017 20:20:45 +0000 (20:20 +0000)]
Merge "Preference SimSettingsActivity not aligned correctly" am:
8d3d166823
am:
c6525f5e24
Change-Id: I2516b9132982104ef870d79a7c63c7d002f036de
Jie Cheng [Thu, 16 Nov 2017 20:18:44 +0000 (20:18 +0000)]
Merge "Preference SimSettingsActivity not aligned correctly"
am:
8d3d166823
Change-Id: I67a977b974ddbf42b01647e4ca02d7d9dfe1b61d
Treehugger Robot [Thu, 16 Nov 2017 20:14:27 +0000 (20:14 +0000)]
Merge "Preference SimSettingsActivity not aligned correctly"
Jie Cheng [Mon, 25 Sep 2017 05:54:55 +0000 (13:54 +0800)]
Preference SimSettingsActivity not aligned correctly
The preference SimSettingsActivity in the screen "Network & Internet"
never uses a summary. However the text for this preference ("SIM cards")
is top aligned in order to make room for an extra line for the
non-existing summary.
Solved by setting the summary to @string/summary_empty for the
preference SimSettingsActivity. This will make the text in the
preference to align correctly and not leave extra room for a summary.
Test: manual - Checked that preference SimSettingsActivity is correctly
aligned in screen "Network & Internet".
Bug:
69405185
Change-Id: I1a1b3fa7253bbf2a5299f54cc8c4d3e857ca059c
Fan Zhang [Thu, 16 Nov 2017 01:36:10 +0000 (01:36 +0000)]
Merge "Catch exception when checking WifiDisplay availability" am:
7a08901d1b
am:
6d5e7bf41f
Change-Id: I8e1453bdd39ce220381a3368846bb137c4878dd4
Fan Zhang [Thu, 16 Nov 2017 01:33:31 +0000 (01:33 +0000)]
Merge "Catch exception when checking WifiDisplay availability"
am:
7a08901d1b
Change-Id: I426208a605e3771238bd91c135e47faf1b559e58
Treehugger Robot [Thu, 16 Nov 2017 01:27:57 +0000 (01:27 +0000)]
Merge "Catch exception when checking WifiDisplay availability"
Fan Zhang [Thu, 19 Oct 2017 23:49:21 +0000 (16:49 -0700)]
Catch exception when checking WifiDisplay availability
Change-Id: Ic2f17905babf43e92a825b8b5b4f8aac7d8ff001
Fixes:
68013053
Test: robotests
Bruno Martins [Wed, 15 Nov 2017 21:56:18 +0000 (21:56 +0000)]
Merge "Settings: Add notification channel for SIM selection" am:
c543d5ba26
am:
7431ad3a80
Change-Id: Ic3241dfe4bc53a1206fb92a1a5c8f0b91cedfca0
Bruno Martins [Wed, 15 Nov 2017 21:54:16 +0000 (21:54 +0000)]
Merge "Settings: Add notification channel for SIM selection"
am:
c543d5ba26
Change-Id: I72ac5944b8b4dc3eb2ad38c89ec8eb12f83b019d
Treehugger Robot [Wed, 15 Nov 2017 21:45:41 +0000 (21:45 +0000)]
Merge "Settings: Add notification channel for SIM selection"
Antony Sargent [Thu, 7 Sep 2017 18:46:58 +0000 (11:46 -0700)]
Fix BluetoothPairingDialogTest to not expect device name
The functional fix for b/
62672248 in ag/
2856166 removes the device name
from the text near the checkbox in the bluetooth pairing dialog, so we
need to stop checking for it in this robotest. However, that functional
fix needs to be in a separate CL from this fix for the robotest, because
the robotest doesn't exist on some of the older branches where the
functional fix needs to be backported.
Bug:
62672248
Test: RunSettingsRoboTests
Change-Id: I17ff3e4f13c20d58cc4027557f275d296ecccc95
Bill Yi [Wed, 15 Nov 2017 03:40:05 +0000 (03:40 +0000)]
Import translations. DO NOT MERGE am:
fbdea47c44 -s ours
am:
8b334cb99a -s ours
Change-Id: I62efe62a723ec05fac73635f10b4c54bfaea7961
Bill Yi [Wed, 15 Nov 2017 03:39:22 +0000 (03:39 +0000)]
Import translations. DO NOT MERGE
am:
cc5fd487eb -s ours
Change-Id: I743524b8dce39e4245389fc6c933f0a9578aaac1
Bill Yi [Wed, 15 Nov 2017 03:37:20 +0000 (03:37 +0000)]
Import translations. DO NOT MERGE
am:
fbdea47c44 -s ours
Change-Id: I791dd2ed3d53ac4230748c61169677190e143919
Xin Li [Wed, 15 Nov 2017 00:38:23 +0000 (16:38 -0800)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: I981fa64f2c744afc31502e29df041c091bf98545
Bruno Martins [Fri, 10 Nov 2017 13:58:46 +0000 (13:58 +0000)]
Settings: Add notification channel for SIM selection
Change-Id: I9318311fd6378a82050bb1604c29f0af2501c8b7
Bill Yi [Tue, 14 Nov 2017 20:42:27 +0000 (12:42 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I72e5c29e7cd17ed3ee1ae77677b74ca287baa241
Bill Yi [Tue, 14 Nov 2017 20:38:18 +0000 (12:38 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic67e156508ed64a3ae1f26c095f72929f29e9b63
Xin Li [Mon, 13 Nov 2017 23:18:37 +0000 (15:18 -0800)]
Merge commit '
937ede14d84c2093f831ff8adab96dca207ad742' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master
Change-Id: I91ee596e3800726445cfff5dd784bae9dfdad3ee
Merged-In: I91c48c73287a271bd6c99e60e216dead22e68764
Malcolm Chen [Tue, 20 Jun 2017 18:14:27 +0000 (11:14 -0700)]
Add an activity that starts DataUsageList fragment for mobile.
We are providing an itent and a corresponding activity to show
"Mobile data usage" fragment, so that "Mobile network setting"
who lives in phone apk can use that intent to open it.
Bug:
62201918
Test: Manual
Change-Id: I862f8bc90f9456f91b436d26472cce23c837a777
Merged-In: I862f8bc90f9456f91b436d26472cce23c837a777
tiansiming [Mon, 13 Nov 2017 19:52:12 +0000 (19:52 +0000)]
Merge "Modify Comparator in ZonePicker" am:
3c03207f9f
am:
cd2e1c1535
Change-Id: I97ec8751980a29d953f1a49b36cc78b66461e3e7
tiansiming [Mon, 13 Nov 2017 19:50:06 +0000 (19:50 +0000)]
Merge "Modify Comparator in ZonePicker"
am:
3c03207f9f
Change-Id: I1c2ebde217a793091ff28f9b2b1850beeb494d52
Treehugger Robot [Mon, 13 Nov 2017 19:45:10 +0000 (19:45 +0000)]
Merge "Modify Comparator in ZonePicker"
tiansiming [Mon, 30 Oct 2017 13:39:48 +0000 (21:39 +0800)]
Modify Comparator in ZonePicker
The previous method "compareTo" isn't locale-sensitive, it cannot
sort the String in some other languages. So Collator is recommended
to be applyed here.
Bug: Sort doesn't work in some languages.
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=ZonePickerComparatorTest
Change-Id: Id107ab938cceefc77f9fb6918a0445fc92a0fcb7
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
Yoshinori Hirano [Fri, 10 Nov 2017 15:21:37 +0000 (15:21 +0000)]
Merge "Send broadcast when location mode is about to change DO NOT MERGE" am:
1c05be48ae -s ours
am:
5c50b5362b
Change-Id: Ibadd921cd884e0ebfc208d64a350a64545516f3a
Yoshinori Hirano [Fri, 10 Nov 2017 15:14:43 +0000 (15:14 +0000)]
Merge "Send broadcast when location mode is about to change DO NOT MERGE"
am:
1c05be48ae -s ours
Change-Id: Ia443491992c0b28a15d93ca344e9b20c0a111548
Treehugger Robot [Fri, 10 Nov 2017 15:07:04 +0000 (15:07 +0000)]
Merge "Send broadcast when location mode is about to change DO NOT MERGE"
Yoshinori Hirano [Tue, 24 Oct 2017 08:52:23 +0000 (17:52 +0900)]
Send broadcast when location mode is about to change DO NOT MERGE
Send "com.android.settings.location.MODE_CHANGING" broadcast intent
when the location mode is about to be changed on Settings app or
Quick Settings.
Fixes:
28057031
Test: manual - turn the location setting on
Change-Id: Icd1049259403999a30263cc866698795b44f9b2e
songkailun [Thu, 9 Nov 2017 21:21:37 +0000 (21:21 +0000)]
Merge "remove unused code in PrivacySettings" am:
abd78cc6b3
am:
0da27eb08c
Change-Id: I3e82479c29fe00c195b80e80497aaa2b402146cd
songkailun [Thu, 9 Nov 2017 21:19:30 +0000 (21:19 +0000)]
Merge "remove unused code in PrivacySettings"
am:
abd78cc6b3
Change-Id: I8772066bf9bf759628f1937ca1949086a8ff8509
Treehugger Robot [Thu, 9 Nov 2017 21:11:22 +0000 (21:11 +0000)]
Merge "remove unused code in PrivacySettings"
songkailun [Thu, 9 Nov 2017 20:59:59 +0000 (20:59 +0000)]
Merge "translate array in res/values-ar" am:
0df2c8fbb7
am:
834025ef19
Change-Id: Ib9c1c3c7ca24dee083e94c3cfdfd987132992937
songkailun [Thu, 9 Nov 2017 20:53:10 +0000 (20:53 +0000)]
Merge "translate array in res/values-ar"
am:
0df2c8fbb7
Change-Id: Ic6175d77665dddd9ccaee29b94be3a11025f45c9
Treehugger Robot [Thu, 9 Nov 2017 20:40:18 +0000 (20:40 +0000)]
Merge "translate array in res/values-ar"
Ningyuan Wang [Wed, 8 Nov 2017 21:37:34 +0000 (21:37 +0000)]
Enforce null check for mAccessPoint
am:
6c12f06bf8
Change-Id: I0fbf4a19a6e28bc66bc6f320dae90bbe438c3341
Ningyuan Wang [Fri, 3 Nov 2017 18:16:56 +0000 (11:16 -0700)]
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
0117b995f44758a64b7af6d2d11e17d10ef125ce)
songkailun [Tue, 7 Nov 2017 11:28:55 +0000 (19:28 +0800)]
remove unused code in PrivacySettings
factory_reset is already removed from privacy_settings.xml,
so it need to be removed from PrivacySettings.java too
Change-Id: I0d295b90173102efb962dde496cf7a8b15d1e0a9
Signed-off-by: songkailun <songkailun@xiaomi.com>
songkailun [Tue, 7 Nov 2017 11:49:09 +0000 (19:49 +0800)]
translate array in res/values-ar
"None" should be translated
Change-Id: I9cd1b21947834a070ba66a7ee7641d0b6617de52
Signed-off-by: songkailun <songkailun@xiaomi.com>
Bill Yi [Tue, 7 Nov 2017 09:48:01 +0000 (09:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
7b75c5a338 -s ours
Change-Id: I129fdafc703d9cb714a49c00c9367b520fc86519
TreeHugger Robot [Tue, 7 Nov 2017 09:41:30 +0000 (09:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Tue, 7 Nov 2017 09:35:56 +0000 (09:35 +0000)]
Import translations. DO NOT MERGE am:
73120a4cdb -s ours
am:
f74efef4fb -s ours
Change-Id: I1841bd7c3fe428749e74e3bda23f3765effb6735
Bill Yi [Tue, 7 Nov 2017 09:33:26 +0000 (09:33 +0000)]
Import translations. DO NOT MERGE
am:
73120a4cdb -s ours
Change-Id: Ida543e80dd13e3b5653c8676fe3032d5693a224d
Bill Yi [Tue, 7 Nov 2017 07:21:01 +0000 (23:21 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I16dfb5a1bbcd9d062c9f24914c0715c5f0cfe95e
Bill Yi [Tue, 7 Nov 2017 07:20:38 +0000 (23:20 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I5e47736d365f0c8e75ec8e9ac0c84d599fbf7180
Erik Kline [Tue, 7 Nov 2017 06:08:59 +0000 (06:08 +0000)]
Merge "Replace dns_tls with private_dns_mode setting" am:
ca92fb5e2b
am:
768f467089
Change-Id: I70b86f3e2ebf823fea8a1516031f9137b2813bb3
Erik Kline [Tue, 7 Nov 2017 06:00:15 +0000 (06:00 +0000)]
Merge "Replace dns_tls with private_dns_mode setting"
am:
ca92fb5e2b
Change-Id: I58c44a04ef75d025f63e9470ed9624a437a7956c
Treehugger Robot [Tue, 7 Nov 2017 05:54:28 +0000 (05:54 +0000)]
Merge "Replace dns_tls with private_dns_mode setting"
Erik Kline [Mon, 30 Oct 2017 06:30:18 +0000 (15:30 +0900)]
Replace dns_tls with private_dns_mode setting
Also includes:
- new layout fragment for private DNS configuration
- PrivateDnsModeDialogPreference handler class
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- manual interaction with private dns developer option works
Bug:
34953048
Bug:
6413396
Change-Id: I3a5490c21f7f3b3e523a247c287f213d19b75a8b
Fan Zhang [Fri, 3 Nov 2017 00:47:06 +0000 (00:47 +0000)]
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
am:
fbc2fd065c -s ours
Change-Id: I37ea4fa3cc14ee73b5bb2bc34612b6f1501c8c20
Fan Zhang [Fri, 3 Nov 2017 00:42:12 +0000 (00:42 +0000)]
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
Fan Zhang [Fri, 3 Nov 2017 00:40:07 +0000 (00:40 +0000)]
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
Fan Zhang [Fri, 3 Nov 2017 00:38:04 +0000 (00:38 +0000)]
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
Fan Zhang [Fri, 3 Nov 2017 00:34:29 +0000 (00:34 +0000)]
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
Fan Zhang [Fri, 3 Nov 2017 00:31:01 +0000 (00:31 +0000)]
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
Fan Zhang [Fri, 3 Nov 2017 00:28:34 +0000 (00:28 +0000)]
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
Fan Zhang [Fri, 3 Nov 2017 00:26:03 +0000 (00:26 +0000)]
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
Fan Zhang [Fri, 3 Nov 2017 00:22:09 +0000 (00:22 +0000)]
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
Fan Zhang [Fri, 3 Nov 2017 00:19:51 +0000 (00:19 +0000)]
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
Fan Zhang [Fri, 3 Nov 2017 00:17:43 +0000 (00:17 +0000)]
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
Fan Zhang [Fri, 3 Nov 2017 00:15:15 +0000 (00:15 +0000)]
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
Fan Zhang [Fri, 3 Nov 2017 00:13:11 +0000 (00:13 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev
am:
1c040c7414 -s ours
Change-Id: Ibcf00afea271d12b533042711317bb2e2356c0e9