Xiangyu/Malcolm Chen
188272e12b
Merge "Use new SubscriptionInfo constructor"
...
am: e8e24e7e0b
2018-08-14 13:59:07 -07:00
Xiangyu/Malcolm Chen
e8e24e7e0b
Merge "Use new SubscriptionInfo constructor"
2018-08-14 18:58:25 +00:00
Malcolm Chen
b9a6c65a65
Use new SubscriptionInfo constructor
...
Bug: 92796390
Test: build
Change-Id: I5a90831b0050a0a201fce5b8f824fcb4c983a722
Merged-In: I5a90831b0050a0a201fce5b8f824fcb4c983a722
2018-08-13 20:26:38 -07:00
Xin Li
fbc7d27155
Merge stage-dr1-aosp-master into stage-aosp-master
...
Bug: 112535855
Change-Id: Ifd79dc537052cc78e7f5451316d637b24c9830ca
2018-08-13 13:01:18 -07:00
Zhaoyu Su
2c23e6ab75
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am: 44360bc96a
...
am: b69559f882
2018-08-09 16:31:49 -07:00
Zhaoyu Su
b69559f882
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
...
am: 44360bc96a
2018-08-09 16:20:45 -07:00
Treehugger Robot
44360bc96a
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
2018-08-09 21:37:17 +00:00
Jordan Liu
efd3dd02b6
Merge "Preserve leading 0s in mcc mnc" am: 593d767e15
...
am: c2a5c47290
2018-08-08 15:50:24 -07:00
Jordan Liu
c2a5c47290
Merge "Preserve leading 0s in mcc mnc"
...
am: 593d767e15
2018-08-08 15:46:32 -07:00
Jordan Liu
593d767e15
Merge "Preserve leading 0s in mcc mnc"
2018-08-08 22:21:40 +00:00
Jordan Liu
f546b97db9
Preserve leading 0s in mcc mnc
...
Fixes: 79408450
Test: ApnEditorTest.java
Change-Id: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
Merged-In: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
2018-08-08 11:35:15 -07:00
Zhaoyu Su
0a9f87667f
Fix ACTION_NFC_SETTINGS doesn't show connection preference
...
NFC settings has been moved from "Device connection" to
"Connection preference". So ACTION_NFC_SETTINGS
should invoke "Connection preference" page.
Test: send intent with action "android.settings.NFC_SETTINGS"
Bug: 111424119
Change-Id: Iea9ddc876aa800f94585c434911be5dc8cedd550
2018-08-08 18:42:27 +09:00
Xin Li
ffc0419e4f
Merge "Merge Android Pie into master" am: eae6f13389
...
am: b745578205
2018-08-07 18:37:11 -07:00
Xin Li
b745578205
Merge "Merge Android Pie into master"
...
am: eae6f13389
2018-08-07 15:06:54 -07:00
Xin Li
eae6f13389
Merge "Merge Android Pie into master"
2018-08-07 16:51:28 +00:00
Xin Li
40a1c33e24
Merge Android Pie into master
...
Bug: 112104996
Change-Id: I4930d57cc584503a8e16e2b69549efb5780faad8
2018-08-06 16:51:22 -07:00
Bill Yi
16191b3408
[automerger skipped] Import translations. DO NOT MERGE
...
am: 000f97dcf9
2018-08-04 18:21:26 -07:00
Bill Yi
000f97dcf9
Import translations. DO NOT MERGE
...
Change-Id: I89c83219dfbf228054284db00548647b94fc398b
Auto-generated-cl: translation import
2018-08-04 07:43:29 -07:00
Dario Freni
1237373743
[automerger skipped] Merge "Include NOTICE file in /product partition." am: aa2ec5f239 -s ours
...
am: 1e56e69a46
2018-07-24 04:02:45 -07:00
Dario Freni
1e56e69a46
[automerger skipped] Merge "Include NOTICE file in /product partition."
...
am: aa2ec5f239
2018-07-24 03:58:08 -07:00
Treehugger Robot
aa2ec5f239
Merge "Include NOTICE file in /product partition."
2018-07-24 10:35:44 +00:00
Chalard Jean
92295f0953
Merge "Use the SSID of the network in the no internet dialog" am: 692f989b98 am: 9971303508
...
am: 28a2b521cf
2018-07-20 12:33:56 -07:00
Chalard Jean
28a2b521cf
Merge "Use the SSID of the network in the no internet dialog" am: 692f989b98
...
am: 9971303508
2018-07-20 12:29:46 -07:00
Chalard Jean
9971303508
Merge "Use the SSID of the network in the no internet dialog"
...
am: 692f989b98
2018-07-20 12:25:39 -07:00
Treehugger Robot
692f989b98
Merge "Use the SSID of the network in the no internet dialog"
2018-07-20 18:57:09 +00:00
Bill Yi
9551717c69
[automerger skipped] Import translations. DO NOT MERGE
...
am: 0a8de9d763
2018-07-20 11:33:55 -07:00
Xin Li
9652d9ec5b
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
...
am: e8858cc954
2018-07-19 23:45:48 -07:00
Bill Yi
0a8de9d763
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I26fa1f1f72571d0541556649bf104446c9522830
2018-07-19 19:35:10 -07:00
Xin Li
e8858cc954
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
...
Bug: 111615259
Change-Id: I0bbc44c97afd0ed6ff7799e866d4b36beee6c3be
2018-07-19 13:50:34 -07:00
Brad Ebinger
aca1e304bd
Merge "IMS: Use the slot based ImsManager factory reset API." am: 9e4ff6fca6
...
am: 15ca33865c
2018-07-16 13:55:25 -07:00
Brad Ebinger
15ca33865c
Merge "IMS: Use the slot based ImsManager factory reset API."
...
am: 9e4ff6fca6
2018-07-16 13:32:55 -07:00
Brad Ebinger
9e4ff6fca6
Merge "IMS: Use the slot based ImsManager factory reset API."
2018-07-16 19:57:31 +00:00
Doris Ling
ca9617ac6b
[automerger skipped] DO NOT MERGE Fix summary text for advanced button.
...
am: 20e7c9d0ba
2018-07-16 11:46:54 -07:00
Doris Ling
20e7c9d0ba
DO NOT MERGE Fix summary text for advanced button.
...
- the resource for the summary text is in the support library. However,
the prebuilt version in the build does not contain the latest change for
the summary text. Add the overlay for the summary resource here with the
updated translation to remove the redundant summary prefix in the
advanced button.
Change-Id: Ib6db0c402d79a2d965e6060b1851d7b898ae3f94
Fixes: 111195268
Test: manual
2018-07-13 12:32:00 -07:00
Hall Liu
f9b76dfda1
Fix usage of SubscriptionInfo ctor
...
am: f0072b7345
2018-07-13 11:27:19 -07:00
Hall Liu
f0072b7345
Fix usage of SubscriptionInfo ctor
...
Use string arguments instead of ints for mcc/mnc
Bug: 35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
(cherry picked from commit 02c5f3c7ac
2018-07-13 10:13:46 -07:00
Hall Liu
1b3985010d
Fix usage of SubscriptionInfo ctor
...
Use string arguments instead of ints for mcc/mnc
Bug: 35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
(cherry picked from commit 02c5f3c7ac
2018-07-13 00:24:39 +00:00
xiamin
7ed2928876
Merge "new password shouldn't be empty string" am: dd7bd6b15a
...
am: bfb61ed2ed
2018-07-11 15:16:20 -07:00
xiamin
bfb61ed2ed
Merge "new password shouldn't be empty string"
...
am: dd7bd6b15a
2018-07-11 14:51:09 -07:00
Treehugger Robot
dd7bd6b15a
Merge "new password shouldn't be empty string"
2018-07-11 20:23:29 +00:00
Bill Yi
78f73c3352
[automerger skipped] Import translations. DO NOT MERGE
...
am: 11ebb14241
2018-07-11 10:48:27 -07:00
Dario Freni
e9d83796ac
Include NOTICE file in /product partition.
...
Test: flashed on a device with /product partition and verified licences
are correctly loaded
Bug: 111179267
Change-Id: I2667029128a56baefbec376b0ec4e4ecdb3c3ad4
Merged-In: I12e9169b1d3d313a6c5da0d575a6526327268381
2018-07-11 10:52:53 +01:00
Bill Yi
11ebb14241
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Id9deb2f66c09d1b17c35d8226673768d40d7eef7
2018-07-10 22:28:21 -07:00
Salvador Martinez
94bebd2f80
Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev
...
am: 4804c2c7a5
2018-07-10 12:41:50 -07:00
TreeHugger Robot
4804c2c7a5
Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev
2018-07-10 19:33:29 +00:00
xiamin
3c2956a08c
new password shouldn't be empty string
...
enter "Home screen backup password" in "Developer Settings",
do nothings and then click "Set backup password", There will
be a toast display "New backup password set".
The new password field cannot be empty.
Bug: https://partnerissuetracker.corp.google.com/u/2/issues/111261338
Test: empty string can not be set as a password
Signed-off-by: xiamin <xiamin@xiaomi.com >
2018-07-10 10:48:56 +08:00
Salvador Martinez
78c3f368c3
Fix incorrect method call to wifiManager in Tether
...
In the WifiTetherApBandController the incorrect method was
being called to check if the device is 5Ghz compatible. We
were calling is5GhzBandSupported directly, but we were
supposed to call isDualBandSupported instead.
Test: robotests updated
Bug: 110793581
Change-Id: I61d3ff10abedde6196b8e29591ebfd3272dbbcd9
2018-07-09 11:52:34 -07:00
Pavel Grafov
0886bf2271
Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev
...
am: dc2db6c6c9
2018-07-09 10:49:22 -07:00
TreeHugger Robot
dc2db6c6c9
Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev
2018-07-09 17:37:19 +00:00
Bill Yi
1d8eba660f
[automerger skipped] Import translations. DO NOT MERGE
...
am: e338a41dac
2018-07-05 20:03:16 -07:00
