Daniel Bright
a87d9fcf31
Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 am: aaf82799c7 am: 940de2cb19
...
Change-Id: Icd738ca81fb418cfbc4ccf90f5273dd91193f864
2020-03-20 05:41:58 +00:00
Sanghee Kim
24565c1b83
Fixed NullPointerException
...
1. only one sim insertion.
2. sim removal in sim card lock setting menu.
Additionally, removed unnecessary code.
Test: manual
Change-Id: I5710b9c313d6e0b7c011a12e0179a4d5a4f7e580
Signed-off-by: Sanghee Kim <haya93@samsung.com >
2020-03-20 14:39:44 +09:00
Daniel Bright
dd03c05c8d
Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 am: aaf82799c7 am: 813d114d86
...
Change-Id: Ib341ab90b25d4763b695d929b1dbb2e2a4945e7d
2020-03-20 05:35:45 +00:00
Bonian Chen
4a49f426fb
[Settings] Avoid from accessing IMS with invalid subscription id
...
Check subscription ID before accessing to IMS APIs
Bug: 149190278
Test: make and manual test
Change-Id: I0561529ccaf23c84d7d6dd3e268386ab82f17418
2020-03-20 13:31:35 +08:00
Daniel Bright
940de2cb19
Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 am: aaf82799c7
...
Change-Id: I09163a0c1da1169c88352a943684b4d7c8a52027
2020-03-20 05:29:44 +00:00
Daniel Bright
813d114d86
Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 am: aaf82799c7
...
Change-Id: I17504ffdfeba4ce1458310501c7f8c6dea2a747f
2020-03-20 05:29:25 +00:00
Daniel Bright
5e0c8e145f
Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 am: 7178e1070b am: 087f54d0e6
...
Change-Id: Id141a3dfea57f10f919fe2c24d3c0c5538816fe3
2020-03-20 05:27:03 +00:00
Daniel Bright
c90b1c628f
Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f am: dc3ca505f8 am: dee99a5407
...
Change-Id: I134f88308ae2a82af63ca387806da81a091b9ebd
2020-03-20 05:26:30 +00:00
Sooraj Sasindran
788ce5e242
Revert "access system resources with android.R package" am: 253ba4f3ef am: 9c35cfa688 am: 941b518e7d
...
Change-Id: I7558cc2ce4d29aad6e1b7950062efbe144306fd0
2020-03-20 05:26:26 +00:00
Daniel Bright
36ff5bdc4a
Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f am: da2fe00a04 am: d46bf256b9
...
Change-Id: I5695a8446136721e47cf9c8a6f708c68d8a90fa9
2020-03-20 05:26:18 +00:00
Sooraj Sasindran
9885fd223a
Revert "access system resources with android.R package" am: 253ba4f3ef am: 2628af114d am: 5d42a76fcd
...
Change-Id: Ie2671eebc7f57108d650908989b737ca46ca9d36
2020-03-20 05:26:15 +00:00
Goven Liu
4691f47ff9
Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: 1853ed32df am: c96a4f2bd4
...
Change-Id: I7c71e2ccd27f1c8239fcbc895152fccbcbbea2a5
2020-03-20 05:25:59 +00:00
Goven Liu
e909a1def8
Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: a3e9660230 am: bb21d59c96
...
Change-Id: Ib9c3babc5eba602d488ea2a6117008be9d50d96d
2020-03-20 05:25:46 +00:00
Daniel Bright
170541e854
Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f am: da2fe00a04 am: da8d46bdf9
...
Change-Id: Iddffc8ea840094a6ddbc0f7cf9069cb8494d6c07
2020-03-20 05:23:26 +00:00
Sooraj Sasindran
46a5ddb514
Revert "access system resources with android.R package" am: 253ba4f3ef am: 2628af114d am: cb5953d272
...
Change-Id: I71315fa6dc5f3d2a6060d542836c450ac6d6bf8e
2020-03-20 05:23:21 +00:00
Goven Liu
8450e47487
Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: a3e9660230 am: 1db751a1d3
...
Change-Id: I5a51956e2dcd97ccfd0e0dc579d21d75555014c8
2020-03-20 05:22:59 +00:00
Daniel Bright
087f54d0e6
Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 am: 7178e1070b
...
Change-Id: I397fc8e12f74e8ecfd72dad11f0ae5a5175dae01
2020-03-20 05:19:18 +00:00
Daniel Bright
dee99a5407
Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f am: dc3ca505f8
...
Change-Id: Ic9c14f6d20855a38211f08dc33b320f496fd4f2e
2020-03-20 05:18:49 +00:00
Sooraj Sasindran
941b518e7d
Revert "access system resources with android.R package" am: 253ba4f3ef am: 9c35cfa688
...
Change-Id: I6e0e6f3c8df4a7a5b7ddb59f2ca425eb9eb49352
2020-03-20 05:18:44 +00:00
Goven Liu
c96a4f2bd4
Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: 1853ed32df
...
Change-Id: Ifcd7939373d7f1b880959816b7bfb219ceb9df63
2020-03-20 05:18:25 +00:00
Daniel Bright
aaf82799c7
Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2
...
Change-Id: I334f1df41065c05683484e9f04b68d285b46b7f5
2020-03-20 05:16:31 +00:00
Daniel Bright
7178e1070b
Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2
...
Change-Id: I7cb01e6980193d170eaf0438a47aa9feaf68bcaf
2020-03-20 05:16:29 +00:00
Daniel Bright
da8d46bdf9
Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f am: da2fe00a04
...
Change-Id: I3eae26f6789f463ae82150d2b950c90cfc8f7c61
2020-03-20 05:09:29 +00:00
Sooraj Sasindran
cb5953d272
Revert "access system resources with android.R package" am: 253ba4f3ef am: 2628af114d
...
Change-Id: Ib765d1e4f0485cb3f4d42d659633e1d91c9d2735
2020-03-20 05:09:26 +00:00
Daniel Bright
d46bf256b9
Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f am: da2fe00a04
...
Change-Id: I156e9bfc666975228e9eae6e641fb3c8739f9118
2020-03-20 05:09:19 +00:00
Sooraj Sasindran
5d42a76fcd
Revert "access system resources with android.R package" am: 253ba4f3ef am: 2628af114d
...
Change-Id: I2bb5796b7c181d68a8c1d6a4cba3201162930a02
2020-03-20 05:09:17 +00:00
Goven Liu
bb21d59c96
Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: a3e9660230
...
Change-Id: I9bafbacf24f2d26446e043fcc9952dde9eaaa6ba
2020-03-20 05:08:58 +00:00
Goven Liu
1db751a1d3
Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: a3e9660230
...
Change-Id: Ia16dae9b6da10974921566f8299eb4b85e128a1d
2020-03-20 05:08:57 +00:00
Daniel Bright
da2fe00a04
Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f
...
Change-Id: Ifb96ebf14d46e5c07a3cc7b96bb067f55b129b3f
2020-03-20 05:02:02 +00:00
Sooraj Sasindran
2628af114d
Revert "access system resources with android.R package" am: 253ba4f3ef
...
Change-Id: Idf5eee8350df4aaa7ea37f85677b315b35c56028
2020-03-20 05:01:58 +00:00
Daniel Bright
dc3ca505f8
Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f
...
Change-Id: I115213610426564c133ddb0ca185f4273ceac242
2020-03-20 04:58:44 +00:00
Sooraj Sasindran
9c35cfa688
Revert "access system resources with android.R package" am: 253ba4f3ef
...
Change-Id: I78a68e8eef3b3cee9911cb89a9bd09ce83020357
2020-03-20 04:58:39 +00:00
Daniel Bright
b5e5aa9ef2
Merge "Revert "access system resources with android.R package"" into rvc-dev
2020-03-20 04:57:43 +00:00
Daniel Bright
6249dfbd9f
Merge "Revert "access system resources with android.R package"" into rvc-dev
2020-03-20 04:57:43 +00:00
Goven Liu
1853ed32df
Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9
...
Change-Id: Idce71a7d430a0d6da7fb8fa821e3853e0c2a9921
2020-03-20 04:57:38 +00:00
Goven Liu
a3e9660230
Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9
...
Change-Id: I35f128811a9d4e480ada35a99f1fa4b90c243834
2020-03-20 04:56:52 +00:00
Goven Liu
b626a602c9
Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev
2020-03-20 04:54:46 +00:00
TreeHugger Robot
2b5552d95b
Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb am: bf82eab918 am: 1bea826cad am: 75062d0a6a
...
Change-Id: I10b880b52bcb890657ace310bff9b52a783efa7d
2020-03-20 04:43:50 +00:00
TreeHugger Robot
b2c979737d
Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb am: d5f0f2d8c8 am: c38b757ae2
...
Change-Id: I81eef8a4349fc716850b44dd1d6af0e7bd340c6c
2020-03-20 04:25:45 +00:00
TreeHugger Robot
613f585f35
Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb am: bf82eab918 am: 33a8eb6d3a
...
Change-Id: I0a08c3584a81d58b5c391c28f409b0031ef8d784
2020-03-20 04:25:21 +00:00
TreeHugger Robot
75062d0a6a
Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb am: bf82eab918 am: 1bea826cad
...
Change-Id: I1c3db45282066d8f10fbca84f2719d8e01d94581
2020-03-20 04:25:19 +00:00
TreeHugger Robot
c38b757ae2
Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb am: d5f0f2d8c8
...
Change-Id: I43810592e434d751f33d3c89175f835c3be264b5
2020-03-20 04:20:14 +00:00
TreeHugger Robot
b4922a7647
[automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d -s ours am: dc1f295a59 -s ours am: e04ffe1aa1 -s ours am: 779a069520 -s ours am: 303eabfc93 -s ours
...
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 91399607fe is in history
Change-Id: I546d15b890be7b81d63bb8512cc49b50ef32b538
2020-03-20 04:19:42 +00:00
TreeHugger Robot
1bea826cad
Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb am: bf82eab918
...
Change-Id: If87953e41319b8660dab392f339092c30ce7f6f6
2020-03-20 04:13:50 +00:00
TreeHugger Robot
33a8eb6d3a
Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb am: bf82eab918
...
Change-Id: Ifecd2010f27b8ba5863a25adfae513b5b347b5c2
2020-03-20 04:13:15 +00:00
TreeHugger Robot
303eabfc93
[automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d -s ours am: dc1f295a59 -s ours am: e04ffe1aa1 -s ours am: 779a069520 -s ours
...
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history
Change-Id: Ie0acf11792ad4a43b510f8cabd1730047690e354
2020-03-20 04:02:16 +00:00
TreeHugger Robot
d5f0f2d8c8
Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb
...
Change-Id: Id86e0b84a70cfbeb2e96590b2d90d6059b94f37b
2020-03-20 04:02:14 +00:00
TreeHugger Robot
80e8fb186f
[automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d -s ours am: dc1f295a59 -s ours am: f28bf18e57 -s ours am: d01a8626ee -s ours
...
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 91399607fe is in history
Change-Id: I5f470948514d27bc3c2b2bcb55285f8735207bc9
2020-03-20 04:02:09 +00:00
TreeHugger Robot
902a7527ae
[automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d -s ours am: dc1f295a59 -s ours am: e04ffe1aa1 -s ours am: 291dce128c -s ours
...
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history
Change-Id: I0d84ae5e555c12aafbdd0f3634ddd06fdfba3be9
2020-03-20 04:01:48 +00:00
TreeHugger Robot
bf82eab918
Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb
...
Change-Id: Idb9f81cf4621e1d62fa182bdfafbfdb105390ff8
2020-03-20 04:01:46 +00:00