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
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
Jeff Sharkey
1ddfd32006
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours am: 0f53a56cbd
...
am: 9138455b41
2017-10-11 22:23:51 +00:00
Jeff Sharkey
8b399b3eb7
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
2017-10-11 22:02:29 +00:00
Jeff Sharkey
9138455b41
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours
...
am: 0f53a56cbd
2017-10-11 22:00:24 +00:00
Jeff Sharkey
952ae3ec34
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
2017-10-11 21:42:57 +00:00
Jeff Sharkey
0f53a56cbd
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb
...
am: 250d5e60b0
2017-10-11 21:42:14 +00:00
Jeff Sharkey
e803004863
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
2017-10-11 21:34:11 +00:00
Jeff Sharkey
250d5e60b0
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3
...
am: 3aa36a6afb
2017-10-11 21:33:01 +00:00
Jeff Sharkey
09112f231c
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003 -s ours am: 47bc5fba05
...
am: 4d61a1bd15
2017-10-11 21:28:38 +00:00
Jeff Sharkey
c1574a1ef8
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours am: b410435a21
...
am: de7c312543
2017-10-11 21:27:27 +00:00
Jeff Sharkey
8bdd94e292
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df
...
am: f4e2e26064
2017-10-11 21:26:28 +00:00
Jeff Sharkey
4d61a1bd15
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003 -s ours
...
am: 47bc5fba05
2017-10-11 21:24:25 +00:00
Jeff Sharkey
2433b6dc44
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d
...
am: d721694b79
2017-10-11 21:21:40 +00:00
Jeff Sharkey
3aa36a6afb
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239
...
am: 53a69985b3
2017-10-11 21:20:09 +00:00
Jeff Sharkey
47bc5fba05
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda
...
am: efe9e7e003
2017-10-11 21:12:41 +00:00
Fan Zhang
eef095d0ee
Merge "Move SettingsRobolectricTestRunner to testutils." am: 16db22a9c8 -s ours
...
am: e39bcb6bf5
2017-10-11 21:11:25 +00:00
Jeff Sharkey
de7c312543
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours
...
am: b410435a21
2017-10-11 21:10:10 +00:00
Jeff Sharkey
f4e2e26064
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
...
am: 9c39da39df
2017-10-11 21:09:20 +00:00
Jeff Sharkey
d721694b79
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e
...
am: 86cc9a681d
2017-10-11 21:01:29 +00:00
Fan Zhang
e39bcb6bf5
Merge "Move SettingsRobolectricTestRunner to testutils."
...
am: 16db22a9c8
2017-10-11 21:01:23 +00:00
Jeff Sharkey
53a69985b3
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3
...
am: b3d4bc8239
2017-10-11 21:00:27 +00:00
Jeff Sharkey
efe9e7e003
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0
...
am: fe1daa6eda
2017-10-11 20:57:51 +00:00
Jeff Sharkey
86cc9a681d
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours
...
am: 004f90f35e
2017-10-11 20:46:28 +00:00
Treehugger Robot
16db22a9c8
Merge "Move SettingsRobolectricTestRunner to testutils."
2017-10-11 20:45:19 +00:00
Jeff Sharkey
b3d4bc8239
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours
...
am: 89791cb5c3
2017-10-11 20:45:04 +00:00
Jeff Sharkey
fe1daa6eda
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf
...
am: 979efb53d0
2017-10-11 20:44:53 +00:00
Jeff Sharkey
b410435a21
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346
...
am: 46bc2bd7bd
2017-10-11 20:39:07 +00:00
Jeff Sharkey
cf1c0b1f58
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa -s ours am: 70387afef9
...
am: 9173362f4e
2017-10-11 20:36:04 +00:00
Jeff Sharkey
004f90f35e
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7
...
am: ba66bb8a43
2017-10-11 20:35:23 +00:00
Jeff Sharkey
89791cb5c3
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb
...
am: 45926efd0f
2017-10-11 20:34:40 +00:00
TreeHugger Robot
9c39da39df
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
2017-10-11 20:32:55 +00:00
Jeff Sharkey
ba66bb8a43
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab
...
am: 95bbef26d7
2017-10-11 20:32:38 +00:00
Jeff Sharkey
45926efd0f
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499
...
am: 556688abdb
2017-10-11 20:31:41 +00:00
Jeff Sharkey
979efb53d0
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d
...
am: 7c41707eaf
2017-10-11 20:29:25 +00:00
Jeff Sharkey
95bbef26d7
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188
...
am: e38a7f42ab
2017-10-11 20:28:13 +00:00
Jeff Sharkey
46bc2bd7bd
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d
...
am: 0bcee25346
2017-10-11 20:28:11 +00:00
Jeff Sharkey
9173362f4e
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa -s ours
...
am: 70387afef9
2017-10-11 20:27:42 +00:00
Jeff Sharkey
556688abdb
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 019f31b499
2017-10-11 20:26:40 +00:00
Jeff Sharkey
7c41707eaf
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: f32a4fad5d
2017-10-11 20:25:11 +00:00
Jeff Sharkey
e38a7f42ab
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 94e678c188
2017-10-11 20:24:31 +00:00
