Alex Johnston
37fa5bd059
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev
2020-03-13 14:28:15 +00:00
Automerger Merge Worker
e0ebc3382b
Merge "Settings performance testing" am: 4186be0f29 am: 0c0a52cc12 am: 43d0d904c9 am: 00e82ceb9b
...
Change-Id: I2274b7ea34e9ed20eef7c935dae2acde2c4b912a
2020-03-13 14:23:58 +00:00
Automerger Merge Worker
00e82ceb9b
Merge "Settings performance testing" am: 4186be0f29 am: 0c0a52cc12 am: 43d0d904c9
...
Change-Id: Icb68bd2fb4823fdf68146c4a0ab337cd6dc24468
2020-03-13 14:11:57 +00:00
Automerger Merge Worker
43d0d904c9
Merge "Settings performance testing" am: 4186be0f29 am: 0c0a52cc12
...
Change-Id: I4ed00fb35eb82352a0609fd089d4fbb06ed01ef0
2020-03-13 13:57:02 +00:00
Automerger Merge Worker
0c0a52cc12
Merge "Settings performance testing" am: 4186be0f29
...
Change-Id: Iaf5b3e75f376bc7dc2e875f1e10adecedc34231a
2020-03-13 13:35:25 +00:00
Raff Tsai
4186be0f29
Merge "Settings performance testing"
2020-03-13 13:22:57 +00:00
Automerger Merge Worker
193fb394a6
Merge "[Settings] Refactor DataUsageSummaryPreferenceController" am: aa08222778 am: df7216a144 am: a100aa0b4a am: ab353c9386 am: 5d46f36fc8
...
Change-Id: I9aafc9fa2341a23ded3a5969fa23d61acecdd64f
2020-03-13 13:22:57 +00:00
Automerger Merge Worker
19a7d1181a
[automerger skipped] Merge "[Settings] Avoid crash when adding new APN" am: 18bf77eef9 am: 3fd54b4e67 -s ours am: 9777ca7dd9 -s ours am: 0d7ec3ca9a -s ours am: 466aded3ea -s ours
...
am skip reason: Change-Id I70362a2aea15c5eb52d10af21025cf9643097803 with SHA-1 cd1fd106c9
2020-03-13 13:22:50 +00:00
youtengliang
ef861b0e3e
Settings performance testing
...
Test: atest com.android.settings.tests.perf LaunchSettingsTest
Change-Id: I32a077b22bc4cd36c7aab32dd22dede87b406641
2020-03-13 13:22:38 +00:00
Automerger Merge Worker
86423292c2
Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf am: 10ff4f4ab6 am: 7bb5275105 am: c2a1ae3178 am: cf3f6ebbfa
...
Change-Id: I9b992971eeec178722112c36499f76002f6172f8
2020-03-13 13:22:37 +00:00
Automerger Merge Worker
7873575ae2
Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94 am: 7ecae6dd06 am: 68725db15f am: 7f7042e7a1 am: 803eb334a5
...
Change-Id: I5c0e07bb169bd039e53883253f636d7bfc4ac71c
2020-03-13 13:22:22 +00:00
Automerger Merge Worker
5d46f36fc8
Merge "[Settings] Refactor DataUsageSummaryPreferenceController" am: aa08222778 am: df7216a144 am: a100aa0b4a am: ab353c9386
...
Change-Id: Id63b38d0666f21566858889ad4d317f59607ecbc
2020-03-13 13:03:10 +00:00
Automerger Merge Worker
466aded3ea
[automerger skipped] Merge "[Settings] Avoid crash when adding new APN" am: 18bf77eef9 am: 3fd54b4e67 -s ours am: 9777ca7dd9 -s ours am: 0d7ec3ca9a -s ours
...
am skip reason: Change-Id I70362a2aea15c5eb52d10af21025cf9643097803 with SHA-1 cd1fd106c9
2020-03-13 13:03:04 +00:00
Automerger Merge Worker
cf3f6ebbfa
Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf am: 10ff4f4ab6 am: 7bb5275105 am: c2a1ae3178
...
Change-Id: Ie38349c7b8fc21dfe426b9a66091ad398e9506ea
2020-03-13 13:02:55 +00:00
Automerger Merge Worker
803eb334a5
Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94 am: 7ecae6dd06 am: 68725db15f am: 7f7042e7a1
...
Change-Id: I99206928bf607aadf33b876683816945574bb0c5
2020-03-13 13:02:24 +00:00
Automerger Merge Worker
ab353c9386
Merge "[Settings] Refactor DataUsageSummaryPreferenceController" am: aa08222778 am: df7216a144 am: a100aa0b4a
...
Change-Id: I06bf1b8fcaf2033ae01f29b3ecb075ec7f496759
2020-03-13 12:47:25 +00:00
Automerger Merge Worker
0d7ec3ca9a
[automerger skipped] Merge "[Settings] Avoid crash when adding new APN" am: 18bf77eef9 am: 3fd54b4e67 -s ours am: 9777ca7dd9 -s ours
...
am skip reason: Change-Id I70362a2aea15c5eb52d10af21025cf9643097803 with SHA-1 cd1fd106c9
2020-03-13 12:47:20 +00:00
Automerger Merge Worker
c2a1ae3178
Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf am: 10ff4f4ab6 am: 7bb5275105
...
Change-Id: Iaae744e6231dc5ee81a5e4e40cb7e5af2dbe7feb
2020-03-13 12:47:13 +00:00
Automerger Merge Worker
7f7042e7a1
Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94 am: 7ecae6dd06 am: 68725db15f
...
Change-Id: Id45fd1291d70de367e31e3d95665f7a074ad3d6e
2020-03-13 12:46:58 +00:00
Automerger Merge Worker
a100aa0b4a
Merge "[Settings] Refactor DataUsageSummaryPreferenceController" am: aa08222778 am: df7216a144
...
Change-Id: Iee70153f85680bcfa442ca4fb75fe5cbacd33a7c
2020-03-13 12:25:02 +00:00
Automerger Merge Worker
9777ca7dd9
[automerger skipped] Merge "[Settings] Avoid crash when adding new APN" am: 18bf77eef9 am: 3fd54b4e67 -s ours
...
am skip reason: Change-Id I70362a2aea15c5eb52d10af21025cf9643097803 with SHA-1 cd1fd106c9
2020-03-13 12:24:55 +00:00
Automerger Merge Worker
7bb5275105
Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf am: 10ff4f4ab6
...
Change-Id: I9ff971f6bdfea2528074064e68997028f55edd7a
2020-03-13 12:24:48 +00:00
Automerger Merge Worker
68725db15f
Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94 am: 7ecae6dd06
...
Change-Id: Ic5401b124d3b3e637d5c057477204cd84dde6884
2020-03-13 12:24:38 +00:00
Automerger Merge Worker
df7216a144
Merge "[Settings] Refactor DataUsageSummaryPreferenceController" am: aa08222778
...
Change-Id: I15618005ab8331242323d20bbb1c36dd0a8996e1
2020-03-13 12:14:30 +00:00
Bonian Chen
aa08222778
Merge "[Settings] Refactor DataUsageSummaryPreferenceController"
2020-03-13 12:08:30 +00:00
Automerger Merge Worker
3fd54b4e67
Merge "[Settings] Avoid crash when adding new APN" am: 18bf77eef9
...
Change-Id: I0f6034dca48a2f0e6461f6b0559bee0c81410f3f
2020-03-13 12:07:15 +00:00
Automerger Merge Worker
10ff4f4ab6
Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf
...
Change-Id: I90719e21019d7acb9cd208b7b282a865919be775
2020-03-13 12:07:06 +00:00
Automerger Merge Worker
7ecae6dd06
Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94
...
Change-Id: I07ac521d3822a644cad29667a59fd1ae0bf848a3
2020-03-13 12:06:59 +00:00
Bonian Chen
18bf77eef9
Merge "[Settings] Avoid crash when adding new APN"
2020-03-13 12:06:15 +00:00
Bonian Chen
52dd9f5abf
Merge "[Settings] Code Refactor of MobileNetworkPreferenceController"
2020-03-13 12:05:36 +00:00
Bonian Chen
0972a6dd94
Merge "[Settings] Refactor DisabledSubscriptionController"
2020-03-13 11:52:53 +00:00
Automerger Merge Worker
39076569c2
Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172 am: a0d1887a98 am: 0cd7089858 am: 091f6b0339 am: e4d3cf4a77
...
Change-Id: I33e535a1ba02766d70d62e0a391683a465b503d0
2020-03-13 11:50:00 +00:00
Automerger Merge Worker
3795880114
Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79 am: 6865bece3c am: 66913f8aea am: aef5324ab5 am: fe4003fd11
...
Change-Id: Iad75f825c5ad0d52d7b207d73b0b9943dedf10c6
2020-03-13 11:49:30 +00:00
Automerger Merge Worker
e4d3cf4a77
Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172 am: a0d1887a98 am: 0cd7089858 am: 091f6b0339
...
Change-Id: If6bdb63fc3f7ef69ee6c96e4669363fe3e865eee
2020-03-13 11:28:55 +00:00
Automerger Merge Worker
fe4003fd11
Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79 am: 6865bece3c am: 66913f8aea am: aef5324ab5
...
Change-Id: I27dd60358d4b78edda513e7f77aa3c67a58428d1
2020-03-13 11:27:21 +00:00
Automerger Merge Worker
091f6b0339
Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172 am: a0d1887a98 am: 0cd7089858
...
Change-Id: I4fdbd1386df9b0f426138a16fc60910d8f007337
2020-03-13 11:10:25 +00:00
Automerger Merge Worker
aef5324ab5
Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79 am: 6865bece3c am: 66913f8aea
...
Change-Id: I7c99ae47c4980d919e671ea927a17fb3053352f1
2020-03-13 11:09:47 +00:00
Bonian Chen
5a3d379293
[Settings] Avoid crash when adding new APN
...
Avoid from crash when adding new APN.
Bug: 150567855
Test: manual
Change-Id: I8af369878eef763df2fcfe808740334d556a58b7
Merged-In: I70362a2aea15c5eb52d10af21025cf9643097803
2020-03-13 11:00:17 +00:00
Automerger Merge Worker
0cd7089858
Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172 am: a0d1887a98
...
Change-Id: Ieef9db81e296054a8531deca5d457971f8f97a87
2020-03-13 10:48:05 +00:00
Automerger Merge Worker
66913f8aea
Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79 am: 6865bece3c
...
Change-Id: Ief981d07dab30741c639edab6cd31bbd20476238
2020-03-13 10:47:39 +00:00
Automerger Merge Worker
a0d1887a98
Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172
...
Change-Id: Ief12d167f83e6898a16963fbd8718993a3e6d48d
2020-03-13 10:28:12 +00:00
Automerger Merge Worker
6865bece3c
Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79
...
Change-Id: I6360f84936f696431af97c0cafe796c93e21f58a
2020-03-13 10:27:57 +00:00
Automerger Merge Worker
7060db35a5
Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: f08d965b53 am: 1b87244013 am: 627642cc0d am: 01cd224a89
...
Change-Id: I20965d2f0976735f350c515dbe3e3900eb16aa21
2020-03-13 10:20:34 +00:00
Automerger Merge Worker
01cd224a89
Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: f08d965b53 am: 1b87244013 am: 627642cc0d
...
Change-Id: I046f986fa2470ff66eedf5205363f59584cdc5cb
2020-03-13 10:20:24 +00:00
Automerger Merge Worker
a31325a705
Merge "[Settings] Refactor MmsMessagePreferenceController" am: 1f1843f11c am: 57e2e2424a am: 13e5aa329d am: a777ff42e8 am: be6302cbd0
...
Change-Id: I4c70242bfa85a878ae1b77e238aac0cca19be52b
2020-03-13 10:20:22 +00:00
Automerger Merge Worker
39081ed5c7
Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: 95ada20d2e am: 04b93d19fe am: ce57a9f11f
...
Change-Id: I6ba0b8041210f9637b9f12b4bcf1705b1c3af37a
2020-03-13 10:20:15 +00:00
Automerger Merge Worker
7e427ab997
Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: f08d965b53 am: 648fe31181 am: 053b614f70
...
Change-Id: Ia20cbab27b29416dd55923bfb993e4d91dab8059
2020-03-13 10:19:57 +00:00
Bonian Chen
985352d172
Merge "[Settings] Refactor CarrierPreferenceController"
2020-03-13 10:12:29 +00:00
Bonian Chen
1b00c00f79
Merge "[Settings] Refactor Telephony PreferenceController"
2020-03-13 10:11:54 +00:00
Automerger Merge Worker
be6302cbd0
Merge "[Settings] Refactor MmsMessagePreferenceController" am: 1f1843f11c am: 57e2e2424a am: 13e5aa329d am: a777ff42e8
...
Change-Id: Iba8dea8ade2b8bd28ff83ca94e58bc038519a9c6
2020-03-13 10:05:52 +00:00
