Commit Graph

59412 Commits

Author SHA1 Message Date
Automerger Merge Worker
6e6c2c617f [automerger skipped] Merge "Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 71f6ccd61a" into rvc-d1-dev-plus-aosp am: 8e478b7247 am: 8a9b719705 -s ours
am skip reason: Change-Id I011b52fd25ca9ad48be3afcdabd9bdd443cd121d with SHA-1 f64e2b3d10 is in history

Change-Id: I9224e35baa94744e776d31090f2315ec4214301e
2020-02-27 07:36:19 +00:00
Automerger Merge Worker
023c6a2f16 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 am: 7367bb4f2f am: 4278ed856f am: 1fcd257e80
Change-Id: I2e104473d1aeda705f73b1533ee09b04bd9b8fa9
2020-02-27 07:36:05 +00:00
Automerger Merge Worker
b29142bd67 [automerger skipped] Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 155fd0ce61 am: ee14b37f5f am: 31826aa648 -s ours
am skip reason: Change-Id I011b52fd25ca9ad48be3afcdabd9bdd443cd121d with SHA-1 f64e2b3d10 is in history

Change-Id: I6d0b2cf15bbbeae5f0060cb92799c243119199be
2020-02-27 07:35:47 +00:00
Automerger Merge Worker
e22c2757c4 [automerger skipped] Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 155fd0ce61 am: c586f9f7be am: 2d8cc7d8d0 -s ours
am skip reason: Change-Id I011b52fd25ca9ad48be3afcdabd9bdd443cd121d with SHA-1 f64e2b3d10 is in history

Change-Id: I3b42596298f0dd2b0093d1e123dbc2c0aa6eedf7
2020-02-27 07:35:09 +00:00
Automerger Merge Worker
8a9b719705 Merge "Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 71f6ccd61a" into rvc-d1-dev-plus-aosp am: 8e478b7247
Change-Id: I03c110fb906f8d91da134c74bee5f3bfc6c83621
2020-02-27 07:20:43 +00:00
Automerger Merge Worker
1fcd257e80 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 am: 7367bb4f2f am: 4278ed856f
Change-Id: I78b21c0b757b75ad0d0973d3abf7a412aa600679
2020-02-27 07:20:21 +00:00
Automerger Merge Worker
31826aa648 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 155fd0ce61 am: ee14b37f5f
Change-Id: I7b0f40443abcbeb4c1155908f0a51ba15034493f
2020-02-27 07:20:08 +00:00
Automerger Merge Worker
2d8cc7d8d0 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 155fd0ce61 am: c586f9f7be
Change-Id: I0a7eeaf2e0c1d2625b2d43aed0cb5ccaad8b82c9
2020-02-27 07:19:58 +00:00
Automerger Merge Worker
4278ed856f Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 am: 7367bb4f2f
Change-Id: I76b9651da7fe68dc79fb90b649768bd06fa9953f
2020-02-27 06:58:10 +00:00
Automerger Merge Worker
ee14b37f5f Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 155fd0ce61
Change-Id: Ib2e3d9bcf37586c92326d01ed0f5154b115f6d9f
2020-02-27 06:57:50 +00:00
Automerger Merge Worker
8e478b7247 Merge "Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 71f6ccd61a" into rvc-d1-dev-plus-aosp 2020-02-27 06:57:45 +00:00
Automerger Merge Worker
e92f62030e Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 71f6ccd61a
Change-Id: Ifd985b85de7f1e16652484d8742729406196a9a4
2020-02-27 06:57:42 +00:00
Automerger Merge Worker
c586f9f7be Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 155fd0ce61
Change-Id: I832ec03cc05bd9ca6bad3eb336221c640d861af9
2020-02-27 06:57:35 +00:00
Automerger Merge Worker
7367bb4f2f Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7
Change-Id: Ie2b32661845ac31ba856d11b6003879f7e919a4a
2020-02-27 06:46:31 +00:00
TreeHugger Robot
63105b36a7 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev 2020-02-27 06:42:25 +00:00
Automerger Merge Worker
155fd0ce61 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943
Change-Id: Id7354273a08808f7d59d2cee380392b8dce014bd
2020-02-27 06:40:40 +00:00
Automerger Merge Worker
71f6ccd61a Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943
Change-Id: Ie29d41ddd7387380708acdc0a313f000da280193
2020-02-27 06:40:38 +00:00
Automerger Merge Worker
bd1b421c82 Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075 am: 3e5efba257 am: 7d8c70a4c6 am: 2ef7880b35
Change-Id: I5feef86f4d80ac331a97c8d029bfa5f4f5ba4d35
2020-02-27 06:33:12 +00:00
Automerger Merge Worker
e5fbb14a5f Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075 am: 7e33c3e968 am: 20e9c2de4f am: 7af7d1bded
Change-Id: I003cb7a517f38a951389d0cfc01100c94099e0c9
2020-02-27 06:33:07 +00:00
Automerger Merge Worker
b498d0bd2e Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075 am: 7e33c3e968 am: e8dd783105 am: ec1b868e0a
Change-Id: If549f7891315efb06c4aa64d8564524608b37b84
2020-02-27 06:33:00 +00:00
Automerger Merge Worker
23d5e32943 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4
Change-Id: I11f38c08c75c835821e92e761750ffb211b3b98e
2020-02-27 06:25:22 +00:00
Automerger Merge Worker
2ef7880b35 Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075 am: 3e5efba257 am: 7d8c70a4c6
Change-Id: Id4c7a4bf07a029baa37a370f03183105723afe39
2020-02-27 06:11:47 +00:00
Automerger Merge Worker
7af7d1bded Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075 am: 7e33c3e968 am: 20e9c2de4f
Change-Id: Id827e7460bf2dcef56c09d0ab73f83482f509e8f
2020-02-27 06:11:37 +00:00
Automerger Merge Worker
ec1b868e0a Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075 am: 7e33c3e968 am: e8dd783105
Change-Id: I997e5ffbc807ecfb3c9d97d692522c1c53865ee1
2020-02-27 06:11:27 +00:00
Betty Chang
efe4cc3db4 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev 2020-02-27 06:10:25 +00:00
Betty Chang
49f3da75cc Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" 2020-02-27 06:10:04 +00:00
Automerger Merge Worker
7d8c70a4c6 Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075 am: 3e5efba257
Change-Id: I315d61677b865bc6aee33ede80081772fbc00d9a
2020-02-27 05:56:42 +00:00
Automerger Merge Worker
20e9c2de4f Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075 am: 7e33c3e968
Change-Id: I04972b7b23d68f0c7c7ff953d5d35b25c0ae8dd7
2020-02-27 05:56:07 +00:00
Automerger Merge Worker
e8dd783105 Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075 am: 7e33c3e968
Change-Id: I6a991866d1d434c2a0fbebce874f2de9ab3dd285
2020-02-27 05:55:52 +00:00
Automerger Merge Worker
7e33c3e968 Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075
Change-Id: I60fe94ad8b1f44c73857df0ad428b9c1fba3da2a
2020-02-27 05:38:54 +00:00
Automerger Merge Worker
3e5efba257 Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075
Change-Id: Iaed39509cbc4011758e240cdefd2d23a44bdb4c6
2020-02-27 05:38:35 +00:00
TreeHugger Robot
9408533075 Merge "Let footer with learn more become selectable" into rvc-dev 2020-02-27 05:27:26 +00:00
Automerger Merge Worker
2139bea8b1 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 2a428bbe48 am: 52731ec548 am: 942981924c
Change-Id: I30db25cfb385205d96275b6488885ed03c2c7469
2020-02-27 04:40:56 +00:00
Automerger Merge Worker
14fd5c9284 Merge "Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178 am: 853f56ddf6" into rvc-qpr-dev-plus-aosp am: e4cc6e2f00
Change-Id: I9eb0f156a8cde8c03b0af5b29370a3021eedd718
2020-02-27 04:40:50 +00:00
Automerger Merge Worker
32c2da7d2e Merge "Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178" into rvc-d1-dev-plus-aosp am: 79dc71bdfc am: 03bea8f0e0
Change-Id: Iee7361cc1325154d8971aaeb556a7ebd2212cd23
2020-02-27 04:40:20 +00:00
Automerger Merge Worker
37c20fc401 Merge "Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5 am: 5f89cb0f4a" into rvc-qpr-dev-plus-aosp am: aaa31daa76
Change-Id: Id5e13a3e3b1abab1bb85d769a39a2127cafc55a5
2020-02-27 04:39:54 +00:00
Automerger Merge Worker
6fd450320c Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 02790d5285 am: 350ce54f14 am: 13d1a1d40a
Change-Id: I59ca786d6124202701d3aad6c8024534d5e7769a
2020-02-27 04:39:37 +00:00
Automerger Merge Worker
b71753f4e9 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5 am: a642ed8dba am: ab139d4620
Change-Id: I76030197c101393b1fd98da1b4bf6bea2a1c804f
2020-02-27 04:38:45 +00:00
Automerger Merge Worker
942981924c Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 2a428bbe48 am: 52731ec548
Change-Id: I42316ad946e3401e5020e703b636b7905c72e37b
2020-02-27 03:58:58 +00:00
Automerger Merge Worker
e4cc6e2f00 Merge "Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178 am: 853f56ddf6" into rvc-qpr-dev-plus-aosp 2020-02-27 03:58:57 +00:00
Automerger Merge Worker
a896fd8429 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178 am: 853f56ddf6
Change-Id: I6ed4d7580267ce76007f7cbee5ae99a5b468d6b5
2020-02-27 03:58:53 +00:00
Automerger Merge Worker
03bea8f0e0 Merge "Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178" into rvc-d1-dev-plus-aosp am: 79dc71bdfc
Change-Id: Ia03d42cbe12887a0b2689a8bc73edf7dc2593b99
2020-02-27 03:58:52 +00:00
Automerger Merge Worker
aaa31daa76 Merge "Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5 am: 5f89cb0f4a" into rvc-qpr-dev-plus-aosp 2020-02-27 03:58:51 +00:00
Automerger Merge Worker
bc830c55a2 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5 am: 5f89cb0f4a
Change-Id: I06302d594db31c5f8457432c4aa151d4102ba03a
2020-02-27 03:58:48 +00:00
Automerger Merge Worker
13d1a1d40a Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 02790d5285 am: 350ce54f14
Change-Id: I846297138778fbd3dd61ed47ff45b5337cbc5d6a
2020-02-27 03:58:45 +00:00
Automerger Merge Worker
ab139d4620 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5 am: a642ed8dba
Change-Id: I5fb737abb49bec78c9bb0cc51895c0313be82ed3
2020-02-27 03:58:30 +00:00
Automerger Merge Worker
52731ec548 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 2a428bbe48
Change-Id: I7527ad64e192cd01ad7f54f1c48b49da5eb9a714
2020-02-27 03:45:33 +00:00
Automerger Merge Worker
853f56ddf6 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178
Change-Id: I689b513ea5145a6eb1736a4db69c8087318537b2
2020-02-27 03:44:27 +00:00
Automerger Merge Worker
79dc71bdfc Merge "Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178" into rvc-d1-dev-plus-aosp 2020-02-27 03:44:26 +00:00
Automerger Merge Worker
5805974b93 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178
Change-Id: I82cc783d9990e9d16c7ecf2e4511aa0c8824fe56
2020-02-27 03:44:23 +00:00