Jack Yu
d4ef8eca27
Merge "Refactored area update info support" am: 60d6ffbc6c
...
am: 3966912efa
2017-10-20 19:41:05 +00:00
Jack Yu
3966912efa
Merge "Refactored area update info support"
...
am: 60d6ffbc6c
2017-10-20 19:30:29 +00:00
Treehugger Robot
60d6ffbc6c
Merge "Refactored area update info support"
2017-10-20 19:19:09 +00:00
Bill Yi
8313368b32
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: a5d652c89f
2017-10-20 16:47:03 +00:00
TreeHugger Robot
a5d652c89f
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:28:33 +00:00
Ben Schwartz
1fd46833ef
Merge "Add a developer option for controlling DNS over TLS" am: c8207de343
...
am: ed97eaeb4a
2017-10-20 15:15:14 +00:00
Ben Schwartz
ed97eaeb4a
Merge "Add a developer option for controlling DNS over TLS"
...
am: c8207de343
2017-10-20 15:06:10 +00:00
Treehugger Robot
c8207de343
Merge "Add a developer option for controlling DNS over TLS"
2017-10-20 14:58:39 +00:00
Bill Yi
074e2ee9ba
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: Id09f849aa6cdf8d983697e7a6a7f182c5f76e623
2017-10-20 03:21:50 -07:00
Jack Yu
2f010230df
Refactored area update info support
...
1. Refactored area update information support so it
is not limited to channel 50 and Brazil.
2. Added channel 60 for India.
Test: Manual
bug: 37746109
Change-Id: I470cc470f880aadd4f63815e21cdd4a71436a89d
(cherry picked from commit c3cab8ecb8
2017-10-19 17:36:33 -07:00
tiansiming
ecf2bdb46f
Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef
...
am: 92e77cbd43
2017-10-19 19:22:16 +00:00
tiansiming
92e77cbd43
Merge "Fix wrong position of cursor in IccLockSettings"
...
am: 3a3044eeef
2017-10-19 19:20:09 +00:00
Treehugger Robot
3a3044eeef
Merge "Fix wrong position of cursor in IccLockSettings"
2017-10-19 19:14:49 +00:00
tiansiming
64f48b5ce6
Fix wrong position of cursor in IccLockSettings
...
Position of cursor goes to the front when submit
an error pin.
Bug:https://issuetracker.google.com/issues/67839176
Test:
1) Insert a sim card
2) Go to Settings -> Security -> Set up SIM card lock
3) press Lock SIM card checkbox
4) enter 123 and press OK button
Change-Id: I90655f3fa4cb3e4bda251cd0fc62e66300a4b66f
Signed-off-by: tiansiming <tiansiming@xiaomi.com >
2017-10-20 01:26:40 +08:00
Jeff Sharkey
1dcb8522fa
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed am: d88820f3f6 am: 629553fb49 am: 397a3555b5 am: a637e31547 -s ours am: a00521b3a0
...
am: 16776b64c8
2017-10-18 21:52:01 +00:00
Jeff Sharkey
1e23fc8814
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours am: 416ecb20a3 am: e341fe95bd am: 85cb0b43da am: 8f2a69fad3 am: 2a2d92eee8 -s ours am: a829548c12
...
am: 3de9e565c8
2017-10-18 21:50:29 +00:00
Jeff Sharkey
16776b64c8
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed am: d88820f3f6 am: 629553fb49 am: 397a3555b5 am: a637e31547 -s ours
...
am: a00521b3a0
2017-10-18 21:32:46 +00:00
Jeff Sharkey
3de9e565c8
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours am: 416ecb20a3 am: e341fe95bd am: 85cb0b43da am: 8f2a69fad3 am: 2a2d92eee8 -s ours
...
am: a829548c12
2017-10-18 21:31:42 +00:00
Jeff Sharkey
a00521b3a0
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed am: d88820f3f6 am: 629553fb49 am: 397a3555b5
...
am: a637e31547
2017-10-18 21:01:38 +00:00
Jeff Sharkey
a829548c12
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours am: 416ecb20a3 am: e341fe95bd am: 85cb0b43da am: 8f2a69fad3
...
am: 2a2d92eee8
2017-10-18 21:00:49 +00:00
Jeff Sharkey
a637e31547
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed am: d88820f3f6 am: 629553fb49
...
am: 397a3555b5
2017-10-18 20:40:16 +00:00
Jeff Sharkey
2a2d92eee8
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours am: 416ecb20a3 am: e341fe95bd am: 85cb0b43da
...
am: 8f2a69fad3
2017-10-18 20:39:11 +00:00
Jeff Sharkey
397a3555b5
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed am: d88820f3f6
...
am: 629553fb49
2017-10-18 20:26:31 +00:00
Jeff Sharkey
8f2a69fad3
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours am: 416ecb20a3 am: e341fe95bd
...
am: 85cb0b43da
2017-10-18 20:25:25 +00:00
Jeff Sharkey
629553fb49
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed
...
am: d88820f3f6
2017-10-18 20:06:55 +00:00
Jeff Sharkey
85cb0b43da
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours am: 416ecb20a3
...
am: e341fe95bd
2017-10-18 20:06:00 +00:00
Jeff Sharkey
d88820f3f6
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours
...
am: 07c4c8efed
2017-10-18 19:40:12 +00:00
Jeff Sharkey
e341fe95bd
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours
...
am: 416ecb20a3
2017-10-18 19:39:10 +00:00
Jeff Sharkey
07c4c8efed
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716
...
am: 91b1cb4b23
2017-10-18 19:27:49 +00:00
Jeff Sharkey
416ecb20a3
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0
...
am: fad1e6a315
2017-10-18 19:27:11 +00:00
Jeff Sharkey
91b1cb4b23
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c
...
am: a954c8c716
2017-10-18 19:21:53 +00:00
Jeff Sharkey
fad1e6a315
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9
...
am: c1ebc09ff0
2017-10-18 19:20:50 +00:00
Jeff Sharkey
a954c8c716
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39
...
am: 2bf724509c
2017-10-18 18:57:57 +00:00
Jeff Sharkey
c1ebc09ff0
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787
...
am: 9ba609cef9
2017-10-18 18:57:03 +00:00
Jeff Sharkey
2bf724509c
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours
...
am: 19fa568b39
2017-10-18 18:40:10 +00:00
Jeff Sharkey
9ba609cef9
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours
...
am: 5b2a431787
2017-10-18 18:39:25 +00:00
Jeff Sharkey
19fa568b39
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours
...
am: 45fc104958
2017-10-18 18:29:15 +00:00
Jeff Sharkey
5b2a431787
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 4cfc684346
2017-10-18 18:28:28 +00:00
Cai, Min1
f523ca10aa
Merge "Refresh payment preference while resume" am: 05650bb3da
...
am: 088baf348b
2017-10-16 19:41:44 +00:00
Cai, Min1
088baf348b
Merge "Refresh payment preference while resume"
...
am: 05650bb3da
2017-10-16 19:29:33 +00:00
Maurice Lam
0e1c486e74
resolve merge conflicts of f36b25c2df to stage-aosp-master
...
am: d4621f6302
2017-10-16 19:22:12 +00:00
Maurice Lam
d4621f6302
resolve merge conflicts of f36b25c2df to stage-aosp-master
...
Test: Existing tests pass
Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I6e021d1156686aa30bdc051f1fefe16b5c619b80
2017-10-16 18:31:40 +00:00
Daniel Nishi
f1dc9e65f1
Merge "Fix PrivateVolumeSettings be launched repeatedly" am: 31a7b2a4c7
...
am: 5973d32c77
2017-10-15 03:59:02 +00:00
Daniel Nishi
5973d32c77
Merge "Fix PrivateVolumeSettings be launched repeatedly"
...
am: 31a7b2a4c7
2017-10-15 03:47:13 +00:00
Treehugger Robot
05650bb3da
Merge "Refresh payment preference while resume"
2017-10-13 23:10:13 +00:00
Treehugger Robot
f36b25c2df
Merge "There is no NEXT button in find sensor screen of fingerprint."
2017-10-13 21:45:18 +00:00
Daniel Nishi
31a7b2a4c7
Merge "Fix PrivateVolumeSettings be launched repeatedly"
2017-10-13 17:52:58 +00:00
Cai, Min1
0b97d35478
Refresh payment preference while resume
...
To show latest payment service list on Tap&pay menu.
Test: install payment service and go back to Tap&pay menu
Bug: 67718335
Change-Id: I6f421176b9c461898224b50d06f67a49645f0d18
2017-10-12 01:12:14 +00:00
Jeff Sharkey
45fc104958
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 5ef2cfac97
2017-10-11 23:03:25 +00:00
Jeff Sharkey
e9aa79dd1f
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours am: 952ae3ec34
...
am: 8b399b3eb7
2017-10-11 22:25:38 +00:00
