Automerger Merge Worker
042ed76cd9
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: c63489139c am: a782ff473d
...
Change-Id: I6fe2033346739c8063676d7eb7b890d41f4a2389
2020-03-17 13:35:51 +00:00
Automerger Merge Worker
5826fc7933
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2 am: 4f19e358c8
...
Change-Id: I6fbaa60443140b003b97785a35698ec44582cdec
2020-03-17 13:35:39 +00:00
Automerger Merge Worker
a782ff473d
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: c63489139c
...
Change-Id: I85bf952698a5407186fe560b9151ece6825ca348
2020-03-17 13:15:28 +00:00
Automerger Merge Worker
4f19e358c8
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2
...
Change-Id: I4fd74c8dba82fb6d92147c6b72bcbbe142704ea1
2020-03-17 13:15:07 +00:00
Automerger Merge Worker
c63489139c
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510
...
Change-Id: Ic2788de5e3d7926813d5f36293cef55f67edc131
2020-03-17 13:03:09 +00:00
Automerger Merge Worker
85b0f5fcd2
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510
...
Change-Id: I786ed0fefff2d5a81b31b475c154933a5ba5aac5
2020-03-17 13:03:00 +00:00
TreeHugger Robot
76f4a29510
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev
2020-03-17 12:51:04 +00:00
Automerger Merge Worker
37db5d82d8
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e am: 4059a7debf am: 5d722ee5b4
...
Change-Id: Ida02cd3bced4d7ec0c8f906d1279f0e655ebc861
2020-03-17 12:36:02 +00:00
Automerger Merge Worker
5f642ad1bc
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: c57774521c am: d87561f113
...
Change-Id: I31173ba7df8b81dfad14561994cad52ec27c3c66
2020-03-17 12:21:49 +00:00
Automerger Merge Worker
5d722ee5b4
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e am: 4059a7debf
...
Change-Id: Ie117611ebcf9af3b8eee319ad1ed3297e2339c09
2020-03-17 12:21:40 +00:00
Automerger Merge Worker
7b83400539
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e am: f82c724f30
...
Change-Id: I19edd29222bc6176ac6f3b5ac3a75f170e78d54b
2020-03-17 12:21:40 +00:00
Automerger Merge Worker
d87561f113
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: c57774521c
...
Change-Id: Iaaa8782d661a4aab5fa0c3bf05e9180be57bcafa
2020-03-17 12:11:00 +00:00
Automerger Merge Worker
4059a7debf
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e
...
Change-Id: I0e6ea23f432c71562274c69e1c203e15cef9ce45
2020-03-17 12:04:32 +00:00
Automerger Merge Worker
f82c724f30
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e
...
Change-Id: Ia01fd111005b4806d82f909d05cbd3f6359e61d4
2020-03-17 12:04:25 +00:00
Automerger Merge Worker
c57774521c
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640
...
Change-Id: I6b25ea976cbde89633e917491513254163d8418d
2020-03-17 11:50:00 +00:00
Automerger Merge Worker
05985cb26e
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640
...
Change-Id: I055e1aa8b1be85d6ba1218642447885fa9b454d9
2020-03-17 11:49:55 +00:00
TreeHugger Robot
217740d640
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev
2020-03-17 11:32:34 +00:00
calvinpan
ff11f200c8
Add NR Global to the logic to check if it is Global
...
Bug: 151285260
Test: Build pass
Change-Id: I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e
2020-03-17 18:27:34 +08:00
Automerger Merge Worker
93bb2bb58d
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: da9185b887 am: b8b7c24bcc am: b152652975
...
Change-Id: Ifeacb4ccf071058a528d9bc49ca529a089b37b89
2020-03-17 06:44:31 +00:00
SongFerngWang
3d54554521
Fix sim pin lock preference disappear in dual sim.
...
If one sim hide the preference and another one show the preference,
the preference always hide. The root cause is config value is wrong.
It should get config with subid.
Bug: 149800931
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
Change-Id: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
2020-03-17 14:35:31 +08:00
Automerger Merge Worker
404bd786ce
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: e599f0432e am: 708fa8dc80
...
Change-Id: I88d89198977f4d413c082a99de4e99d30863fd4e
2020-03-17 06:32:59 +00:00
Automerger Merge Worker
b152652975
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: da9185b887 am: b8b7c24bcc
...
Change-Id: I1ea9e08fbf6eb1f55f46fb031e53eb0de36c77ec
2020-03-17 06:32:43 +00:00
Automerger Merge Worker
5b0b67f6fd
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: da9185b887 am: d4bf77db85
...
Change-Id: If065eed917c854dd0154b3474d181eb8087e51ba
2020-03-17 06:32:37 +00:00
Automerger Merge Worker
708fa8dc80
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: e599f0432e
...
Change-Id: I204f5e8e8738f3e1ed1202556d455ed7aa2cfa6f
2020-03-17 06:11:59 +00:00
Automerger Merge Worker
b8b7c24bcc
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: da9185b887
...
Change-Id: I34e02d8f1edbe3db7e9128feda8fafa27bcd6695
2020-03-17 06:11:44 +00:00
Automerger Merge Worker
d4bf77db85
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: da9185b887
...
Change-Id: I0a8007c3bfd9dbd61f1856d139a54e97b429fb99
2020-03-17 06:11:19 +00:00
Automerger Merge Worker
da9185b887
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
...
Change-Id: I6807e9d6a88c7a82b5835c773f1216bbe5cd3f24
2020-03-17 05:58:49 +00:00
Automerger Merge Worker
e599f0432e
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
...
Change-Id: Ief773b87a528393024fde3bef29816f6860e07f2
2020-03-17 05:58:42 +00:00
TreeHugger Robot
1a84719041
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev
2020-03-17 05:43:45 +00:00
Automerger Merge Worker
0bb230f6e9
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 am: e1c3cdf682 am: 20de5d75b3 am: d01dc26567
...
Change-Id: Ib0a0ceb065ad8bdd95574899e68faf4cbf158aab
2020-03-17 04:29:36 +00:00
Automerger Merge Worker
d01dc26567
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 am: e1c3cdf682 am: 20de5d75b3
...
Change-Id: I0ba276fa20965ed08efba2b83bfbc40687aa5bc3
2020-03-17 04:17:55 +00:00
Automerger Merge Worker
8828c12ea3
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 am: bd59e9ad27 am: 50130a741b
...
Change-Id: I0f9c210a396406bb0b475a4c77aae9c9218ed0c2
2020-03-17 04:17:41 +00:00
Automerger Merge Worker
61e1d03d3b
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 am: e1c3cdf682 am: dab418626e
...
Change-Id: I66cd127231cec22ae96f18b763bc96961b3d4c9b
2020-03-17 04:17:34 +00:00
Automerger Merge Worker
50130a741b
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 am: bd59e9ad27
...
Change-Id: Iaf734e197a78bc6d513c0cd414d7b174f6d68a7d
2020-03-17 03:55:48 +00:00
Automerger Merge Worker
20de5d75b3
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 am: e1c3cdf682
...
Change-Id: I76fa0d2087a9f540d2f9fcfe3c4f2b3e2ec7f45f
2020-03-17 03:55:47 +00:00
Automerger Merge Worker
dab418626e
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 am: e1c3cdf682
...
Change-Id: I0819ebac710020ea2df799ada34f9fef48337860
2020-03-17 03:55:31 +00:00
Automerger Merge Worker
b1f26eb733
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b am: 0b661e606d am: baa53722d9 am: 55bce43360
...
Change-Id: I6583df5a12710441464d8ff7b2d79933caf9b1a1
2020-03-17 03:46:32 +00:00
Automerger Merge Worker
e1c3cdf682
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
...
Change-Id: I7e826cef3b212bcc53cbdc863e6e241fe656429a
2020-03-17 03:45:49 +00:00
Automerger Merge Worker
bd59e9ad27
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
...
Change-Id: Iada645d9939d5b7343d1ebef27ccba669e9dc268
2020-03-17 03:45:43 +00:00
tim peng
95cd4c9414
Merge "Output switcher header is not updated with the latest media content" into rvc-dev
2020-03-17 03:26:50 +00:00
Automerger Merge Worker
a27bf8a587
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b am: 371df82782 am: 05f048dde5
...
Change-Id: Ib3add69b53da348b61254d32cf17204c40edd571
2020-03-17 03:24:06 +00:00
Automerger Merge Worker
55bce43360
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b am: 0b661e606d am: baa53722d9
...
Change-Id: I12a13b55465f2b4650095acb09194302877237e4
2020-03-17 03:23:52 +00:00
Automerger Merge Worker
d320b6af2d
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b am: 0b661e606d am: e37d169988
...
Change-Id: Ib109951f8072e5abaae88ee8f840ab3c99298abf
2020-03-17 03:22:48 +00:00
Automerger Merge Worker
05f048dde5
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b am: 371df82782
...
Change-Id: I68b21a5b1352674b31ec9b512684856c45142929
2020-03-17 03:06:23 +00:00
Automerger Merge Worker
e37d169988
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b am: 0b661e606d
...
Change-Id: I124abd0ffb65c56245669d26f3d9400bed89dc4a
2020-03-17 03:05:36 +00:00
Automerger Merge Worker
baa53722d9
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b am: 0b661e606d
...
Change-Id: Ie8bed1d1db32aed9402594b81675477b6c214be5
2020-03-17 03:05:16 +00:00
Automerger Merge Worker
371df82782
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b
...
Change-Id: I226fb53261abdeb91e6b8bc77eadc698b1863140
2020-03-17 02:48:03 +00:00
Automerger Merge Worker
0b661e606d
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b
...
Change-Id: Ia0d08c479a2e61f9a35e09c7f3b1bb1f11cac077
2020-03-17 02:47:57 +00:00
Menghan Li
3f5b95193b
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev
2020-03-17 02:28:23 +00:00
Automerger Merge Worker
f0868857fe
Require attention pref not searchable by default am: 593b5671c8 am: 441019142c am: 01b0368b93 am: 9d2a02358c
...
Change-Id: Ib86833d8ed0d2bd5ba3ad551d7793ca2297b681b
2020-03-17 01:28:54 +00:00