Automerger Merge Worker
86b026be4e
Merge "Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: be71dbdda7" into rvc-d1-dev-plus-aosp am: d7a9941088 am: 00a8e4dc70
...
Change-Id: Ia358b090bf49654d56ea5c9232737e1902326b32
2020-03-20 11:50:19 +00:00
Automerger Merge Worker
6fad8f62f6
Merge "Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0" into rvc-d1-dev-plus-aosp am: 81299ce74d am: 106cf460f0
...
Change-Id: I9518bc4eb9dc23aa34eae082e5426cae6a6ca4e3
2020-03-20 11:49:39 +00:00
Bonian Chen
4400503dd8
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: e495a049c4 am: 6a6d143ad2 am: 3d1b805340
...
Change-Id: Ia7dffb5cbab72a827067c9673a8fadc85ac8cb64
2020-03-20 11:49:26 +00:00
Bonian Chen
e2e597c538
Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e am: 78b5db508b am: 5ec5ac505a
...
Change-Id: I95b460761888220716bd2000976a01bc3ef92524
2020-03-20 11:49:11 +00:00
Bonian Chen
d874f73d40
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf am: e3d992094a am: 2f5b6f5350
...
Change-Id: I73692312ef9e266cddac3e6581798bfaeb23793c
2020-03-20 11:48:42 +00:00
Automerger Merge Worker
00a8e4dc70
Merge "Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: be71dbdda7" into rvc-d1-dev-plus-aosp am: d7a9941088
...
Change-Id: I280f3d9af2c3ecd8e630d87aad59a95622470f80
2020-03-20 11:30:50 +00:00
Automerger Merge Worker
106cf460f0
Merge "Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0" into rvc-d1-dev-plus-aosp am: 81299ce74d
...
Change-Id: I69ad6ab73bce7f5d39d6e34f8c489ab0a6a7bcbd
2020-03-20 11:30:36 +00:00
Bonian Chen
3d1b805340
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: e495a049c4 am: 6a6d143ad2
...
Change-Id: I38511a9a62ad29f73500b163748e67722910fa85
2020-03-20 11:30:23 +00:00
Bonian Chen
5ec5ac505a
Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e am: 78b5db508b
...
Change-Id: I52349d357ee81fd902adc80515e0b7f6197aa9f2
2020-03-20 11:30:14 +00:00
Bonian Chen
2f5b6f5350
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf am: e3d992094a
...
Change-Id: I4fcfd9ae20ea503e62c1042e8227e065a44b4713
2020-03-20 11:30:08 +00:00
Automerger Merge Worker
d7a9941088
Merge "Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: be71dbdda7" into rvc-d1-dev-plus-aosp
2020-03-20 11:15:50 +00:00
Automerger Merge Worker
81299ce74d
Merge "Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0" into rvc-d1-dev-plus-aosp
2020-03-20 11:15:47 +00:00
Bonian Chen
49eaf9cc22
Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: be71dbdda7
...
Change-Id: Id507ea34e3e6f787de3dfb91094f8270d4f26e62
2020-03-20 11:15:46 +00:00
Bonian Chen
6a6d143ad2
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: e495a049c4
...
Change-Id: I5eef63e860983ce026ef681ab2f1ce5500634777
2020-03-20 11:15:40 +00:00
Junyu Lai
b5b6a47ebc
Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0
...
Change-Id: I55d1f78c8a0c90a1feef840865fdc9bb686da2cf
2020-03-20 11:15:34 +00:00
Bonian Chen
78b5db508b
Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e
...
Change-Id: Id6591b6f9b6cb773cef09704440df379053f520a
2020-03-20 11:15:25 +00:00
Bonian Chen
e3d992094a
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf
...
Change-Id: Id182022f476a09a71f819f8ef0176fd99ef3545c
2020-03-20 11:15:19 +00:00
Junyu Lai
8a293f07e0
Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721
...
Change-Id: I7c62fbdc6177cfc4f32c221d413e73c9efe667d5
2020-03-20 11:08:58 +00:00
Junyu Lai
040bfe3721
Merge "Adjust code for API council feedback" into rvc-dev
2020-03-20 11:03:47 +00:00
Bonian Chen
be71dbdda7
Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1
...
Change-Id: I218e2a34c62eaef6307475d1c5add31d3ff9ded4
2020-03-20 11:01:52 +00:00
Bonian Chen
e495a049c4
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e
...
Change-Id: Ia9cef50655182a53cae97115708490848974b78e
2020-03-20 11:01:48 +00:00
Bonian Chen
1eb4c78a0e
Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1
...
Change-Id: I15302d3dba68d4473a1e8204c947e13f13f1b346
2020-03-20 11:01:38 +00:00
Bonian Chen
fc9bdd1fdf
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e
...
Change-Id: Ic2c5c2d409176de58ba54dce107b5f94195c4c64
2020-03-20 11:01:30 +00:00
Bonian Chen
26fb6c29c1
Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev
2020-03-20 10:52:38 +00:00
Bonian Chen
06899ffb8e
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev
2020-03-20 10:48:03 +00:00
Bonian Chen
594c267e99
[Settings] mSubId should not be overridden in
...
TelephonyBasePreferenceController
mSubId is a protected member provided by parent class.
Overriding mSubId should be avoided.
Bug: 150535296
Test: manual
Change-Id: I391b034c9badd43094ab52b8b6488bca07ef3c86
2020-03-20 10:46:52 +00:00
TreeHugger Robot
c2e24ebb2b
Merge "[Wi-Fi] Fix Wi-Fi broken tests"
2020-03-20 08:53:54 +00:00
Arc Wang
4fafe6716c
[Wi-Fi] Fix Wi-Fi broken tests
...
Bug: 150910070
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ie9b9384610857e2999fe4642a93c2d31ce3315f3
2020-03-20 15:41:29 +08:00
TreeHugger Robot
68c2623fce
Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: ea1c86bfdc am: db153cfede am: 94975c3bd4 am: 99cb033da9
...
Change-Id: I7b8c5ac3449e081c6981ac38715945905bb2f947
2020-03-20 07:12:30 +00:00
TreeHugger Robot
887509afca
Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: 084933ec19 am: 5970d8d5ec am: d6adab084e
...
Change-Id: I1b8485a9202992f246d06250cc6d5f1fdd30e299
2020-03-20 07:12:09 +00:00
TreeHugger Robot
2c0250d993
Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: ea1c86bfdc am: 9999d6ba97 am: 10c6b6b821
...
Change-Id: I3c0beeb7455b1069ad3095203e6f3d9bafaa65dd
2020-03-20 07:11:48 +00:00
TreeHugger Robot
99cb033da9
Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: ea1c86bfdc am: db153cfede am: 94975c3bd4
...
Change-Id: Id44a2075e06b2897ba51c710fe1d8834141ec192
2020-03-20 07:11:43 +00:00
TreeHugger Robot
d6adab084e
Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: 084933ec19 am: 5970d8d5ec
...
Change-Id: Ia56a07f8251fa49b5cb2990cd7d55a1f99c3d0cb
2020-03-20 06:54:16 +00:00
TreeHugger Robot
94975c3bd4
Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: ea1c86bfdc am: db153cfede
...
Change-Id: I2e890d5d8046b5a4382241c28116890a000ccc91
2020-03-20 06:53:44 +00:00
TreeHugger Robot
10c6b6b821
Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: ea1c86bfdc am: 9999d6ba97
...
Change-Id: I602a28703e29162c33fc319bee242cd24e0ce72e
2020-03-20 06:53:32 +00:00
TreeHugger Robot
5970d8d5ec
Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: 084933ec19
...
Change-Id: I7fc95a6b5773bc8bb9c15df6881903261fb82c47
2020-03-20 06:42:45 +00:00
TreeHugger Robot
db153cfede
Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: ea1c86bfdc
...
Change-Id: Ic4a9281f40db77b91878fbf6deaaf4869fadc83c
2020-03-20 06:42:41 +00:00
TreeHugger Robot
9999d6ba97
Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: ea1c86bfdc
...
Change-Id: I47c1605035ddb4302e2c469addef28f293478cb7
2020-03-20 06:42:11 +00:00
TreeHugger Robot
084933ec19
Merge "Update the icon of security IA." into rvc-dev am: 750ff89856
...
Change-Id: Id398fce942c15b7895bc3b30fca0bc0e8a259ca3
2020-03-20 06:25:02 +00:00
TreeHugger Robot
ea1c86bfdc
Merge "Update the icon of security IA." into rvc-dev am: 750ff89856
...
Change-Id: Iaae4b0e5953fc8846450703809185136db28e3d1
2020-03-20 06:24:34 +00:00
TreeHugger Robot
750ff89856
Merge "Update the icon of security IA." into rvc-dev
2020-03-20 06:11:06 +00:00
Daniel Bright
ec3469fbb5
Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 am: aaf82799c7 am: 940de2cb19 am: a87d9fcf31 am: f94e4db5b0
...
Change-Id: Ida2bba27442a632e8dbe1040931ea259f8a44315
2020-03-20 05:58:14 +00:00
Daniel Bright
3be049fa30
Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f am: da2fe00a04 am: d46bf256b9 am: 36ff5bdc4a am: 159063b68e
...
Change-Id: Ia1963f6902243fb0ed5a53b2624d80a70d4ed29e
2020-03-20 05:57:41 +00:00
Sooraj Sasindran
495378f4d2
Revert "access system resources with android.R package" am: 253ba4f3ef am: 2628af114d am: 5d42a76fcd am: 9885fd223a am: 9e8c20b6e6
...
Change-Id: Ifc177d3e169b3f4d9f513713e6fedddaf08a9111
2020-03-20 05:57:40 +00:00
Goven Liu
97b6b5a2c7
Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: a3e9660230 am: bb21d59c96 am: e909a1def8 am: dea5b67b8f
...
Change-Id: I4aa32a331ad32cbadca746638688f786ead3391e
2020-03-20 05:56:55 +00:00
Daniel Bright
f94e4db5b0
Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 am: aaf82799c7 am: 940de2cb19 am: a87d9fcf31
...
Change-Id: I2e713bcb8bf3d06fbcf90af533543805984206b8
2020-03-20 05:46:11 +00:00
Daniel Bright
159063b68e
Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f am: da2fe00a04 am: d46bf256b9 am: 36ff5bdc4a
...
Change-Id: I405a1a69811c565f067b040abf7f0e90fedc088d
2020-03-20 05:45:49 +00:00
Sooraj Sasindran
9e8c20b6e6
Revert "access system resources with android.R package" am: 253ba4f3ef am: 2628af114d am: 5d42a76fcd am: 9885fd223a
...
Change-Id: Ie88d15410497ba03f7f02abb856d0e5f65e9d69d
2020-03-20 05:45:47 +00:00
Goven Liu
dea5b67b8f
Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: a3e9660230 am: bb21d59c96 am: e909a1def8
...
Change-Id: I3374e7488fd1402e129471936d007c3138059c0b
2020-03-20 05:45:21 +00:00
Daniel Bright
6196625d3e
Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 am: aaf82799c7 am: 813d114d86 am: dd03c05c8d
...
Change-Id: I33aadb85d913cda68f6df6463912fbfdcf0cf3e2
2020-03-20 05:42:18 +00:00
