Bonian Chen
e68a8c4953
Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2
am: 5dba10a956
am: 5975853b18
am: 0f2bc3bad9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425488
Change-Id: I2828a05151f0d5dc0a1ba314b15d0ec89710772f
2020-09-11 09:28:28 +00:00
Ted Wang
3876d72b7c
Update state when there is Bluetooth tethering state changed
...
Monitor Bluetooth Tethering state and update preference when there is
Bluetooth tethering state change.
Add test case to verify when recieve
BluetoothPan.TETHERING_STATE_CHANGED will update bluetooth state
Bug: 138688805
Test: make RunSettingsRoboTests
Merged-Id: I8f468d1d99ed6d87f6cd8305ef56b0d7a5dec95b
Change-Id: I8f468d1d99ed6d87f6cd8305ef56b0d7a5dec95b
2020-09-11 09:09:46 +00:00
Bonian Chen
07536baadf
Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236
am: e73b25e37b
am: 42710f069d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425489
Change-Id: Ic862e8fded74ab13e528874abd690e55d5fb2bfd
2020-09-11 08:42:31 +00:00
Bonian Chen
0f2bc3bad9
Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2
am: 5dba10a956
am: 5975853b18
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425488
Change-Id: I74e8fe4508bcafff0bc08a8d88eff771a1158ec3
2020-09-11 08:42:22 +00:00
Bonian Chen
42710f069d
Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236
am: e73b25e37b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425489
Change-Id: I6a0ebc1fadd409ad57933f5f2e6eb722187c6b40
2020-09-11 08:07:32 +00:00
Bonian Chen
5975853b18
Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2
am: 5dba10a956
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425488
Change-Id: I32087c8910c01323c70eb124cff1247c4d60fed5
2020-09-11 08:04:23 +00:00
Hugh Chen
602e761ba0
Add permission to protect data when sending broadcast
...
This CL before, DevicePickerFragment didn't check the
whether 3rd-party app have Bluetooth permission before
sending broadcast. It's will cause the 3rd-party app can
get Bluetooth device information without request permission.
This CL will send broadcast with Bluetooth permission that
make sure the receiver who have Bluetooth permission can get
this Bluetooth device infomation.
Bug: 161716630
Test: verify on test apk to confirm that not showing mac address.
Change-Id: I6662dc38b3491e5ee467058dd74863ecac27cdd7
2020-09-11 07:23:06 +00:00
Bonian Chen
e73b25e37b
Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425489
Change-Id: Ic35b120bdf5470863b2f5112259280ba051a27c5
2020-09-11 07:18:22 +00:00
Bonian Chen
5dba10a956
Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425488
Change-Id: I3ced24e5b1d9f382e6041c38414d8247c2e2abe4
2020-09-11 07:17:53 +00:00
Bonian Chen
11db11d236
Merge "Fix NullPointerException, TelephonyManager.getServiceState is null"
2020-09-11 06:46:58 +00:00
Bonian Chen
b3efa585f2
Merge "[Settings] subscription UI should be closed when SIM is removed"
2020-09-11 06:46:36 +00:00
Taesu Lee
99637baab2
Avoid unexpected state changes for enhanced preferences
...
Assigning current call state to mCallState right before registering
PhoneStateListener so that the preferences have correct state before
first onCallStateChanged() by initial registration even.
Bug: 166307650
Test: Check the preferences state when onStop() -> onStart()
Change-Id: I861a687497ba4da7a845540fd92ae2b865392d60
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
2020-09-11 14:36:26 +09:00
Taesu Lee
c6cc866d10
Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING
...
Bug: 165660739
Test: Manual
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
Change-Id: Iba07c70cb18e8d9f748518d6d141191de5a3d422
2020-09-11 13:58:18 +09:00
Xin Li
df5b0a4c2d
[automerger skipped] Merge "Merge Android R" am: 36cfa7db8e
-s ours am: 3fd1488575
-s ours am: a486aae1f4
-s ours am: 53be426ddf
-s ours
...
am skip reason: Change-Id I7972af3db5cb995b4a7c4deb982eeef6c3dddaad with SHA-1 ada75ad54d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1421782
Change-Id: Ie074bd5d37e2694337d1a659596f968bb0fae17c
2020-09-11 03:59:09 +00:00
Xin Li
53be426ddf
[automerger skipped] Merge "Merge Android R" am: 36cfa7db8e
-s ours am: 3fd1488575
-s ours am: a486aae1f4
-s ours
...
am skip reason: Change-Id I7972af3db5cb995b4a7c4deb982eeef6c3dddaad with SHA-1 ada75ad54d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1421782
Change-Id: I4185295946132a254d112db31c4f7ef39c34c691
2020-09-11 03:33:38 +00:00
Xin Li
a486aae1f4
[automerger skipped] Merge "Merge Android R" am: 36cfa7db8e
-s ours am: 3fd1488575
-s ours
...
am skip reason: Change-Id I7972af3db5cb995b4a7c4deb982eeef6c3dddaad with SHA-1 ada75ad54d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1421782
Change-Id: I62c3578d5dd1ce64b95dd1b2e54e648a3f362676
2020-09-11 02:02:47 +00:00
SongFerngWang
0c2cabef6e
Fix NullPointerException, TelephonyManager.getServiceState is null
...
Add the null protect for TelephonyManager.getServiceState.
Bug: 166676020
Test: 1. make RunSettingsRoboTests ROBOTEST_FILTER=\
RenameMobileNetworkDialogFragmentTest (PASS)
2. make RunSettingsRoboTests ROBOTEST_FILTER=\
AutoSelectPreferenceControllerTest (PASS)
3. make RunSettingsRoboTests ROBOTEST_FILTER=\
PreferredNetworkModePreferenceControllerTest (PASS)
4. make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (PASS)
Merged-In: I61e59f7ba9d6c64019d620d6cb80099ded41473f
Change-Id: Ib80e5e7498a078435185814d11c3b2bcc4318f59
2020-09-11 09:27:41 +08:00
Bonian Chen
22a70a5e15
[Settings] subscription UI should be closed when SIM is removed
...
When SIM is removed, subscription UI should actively be closed (instead of
waiting for user to leave UI).
Bug: 160197149
Test: manual
Merged-In: I2854147c956faa633a9682eee0028db6cd2d3912
Change-Id: I920b88879a225f1d6ce696c7784d1f6f279c16d9
2020-09-11 09:18:34 +08:00
Xin Li
3fd1488575
[automerger skipped] Merge "Merge Android R" am: 36cfa7db8e
-s ours
...
am skip reason: Change-Id I7972af3db5cb995b4a7c4deb982eeef6c3dddaad with SHA-1 ada75ad54d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1421782
Change-Id: Ie39f3baca4e2059d4e4e1db1a65dd42137223b9d
2020-09-11 00:40:25 +00:00
Xin Li
36cfa7db8e
Merge "Merge Android R"
2020-09-10 17:21:53 +00:00
Bill Yi
64fd27fd35
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4
-s ours am: c59dc080ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12547880
Change-Id: I01197f570e0cc53a724b1ee64819aab2ed954b43
2020-09-09 21:36:37 +00:00
Bill Yi
51726dfb9b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4
-s ours am: 94d3a30bcf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12547880
Change-Id: Icee599694366364e6625d00674516d24621dba9b
2020-09-09 21:29:42 +00:00
Bill Yi
ec05886ffb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae0c6a9fdb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12547885
Change-Id: I8817d412d60565eaba0e7fe6d08209086f83361d
2020-09-09 21:29:28 +00:00
Bill Yi
c59dc080ce
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12547880
Change-Id: I2c1aa46ba97bfd9094471fc00a2c62fdabba6313
2020-09-09 21:09:58 +00:00
Bill Yi
94d3a30bcf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12547880
Change-Id: Iddec8911b06b8da1cf5244c44e505139a48d8453
2020-09-09 21:09:57 +00:00
Bill Yi
ae0c6a9fdb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9cb199fccd6af58b074819d1fdd3d2404fcddfc9
2020-09-09 14:34:33 +00:00
Bill Yi
28825ad9e4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7bc2aaf9e23573eb179950feb6edb427877f0c3f
2020-09-09 13:56:30 +00:00
Xin Li
f82ee6a5d3
Merge Android R
...
Bug: 168057903
Merged-In: I7972af3db5cb995b4a7c4deb982eeef6c3dddaad
Change-Id: I2e7fc7920cde49624ad7bd4053d33fd36d49e809
2020-09-08 16:56:07 -07:00
Hugh Chen
194dd88e7d
Fix settings crash
...
- This CL before, "Previously connected device" didn't
handle dock device. If user have disconnected dock
device will cause Settings crash.
This CL add condition to handle dock device to avoid crash.
- Update test case.
Bug: 157653997
Bug: 167054620
Test: make -j42 RunSettingsRoboTests
Change-Id: I769cee3f589e14a993b00a0ae6ec3ddfba8ef281
Merged-In: I769cee3f589e14a993b00a0ae6ec3ddfba8ef281
2020-09-07 02:59:15 +00:00
Hugh Chen
cb057d6e9e
Show just disconnected device on previously connected
...
- This CL before, previously connected devices will show most
recently connected devices and the maximum is 3.
In this time, if next most recently connected device is disconnected.
It's will not show on "previously connected devices", user needs go to
"see all" page to found that device.
This CL add rule to compare the priority of most recently connected
device. If priority of next disconnected device is higher than
currnect devices that on "previously connected devices".
Let next disconnected device show on "previously connected devices".
- Update test case.
Bug: 157653997
Test: make -j42 RunSettingsRoboTests
Change-Id: I684501a20a67755b2196ba9d4b5565add01a5d01
Merged-In: I684501a20a67755b2196ba9d4b5565add01a5d01
2020-09-07 02:59:06 +00:00
Hugh Chen
30a97a9cc5
Display "see all" option when bluetooth is off
...
- This CL before, Bluetooth settings will hide the "see all"
option when bluetooth is off. For the UX improvement, this
CL will show the "see all" button when bluetooth is off. And
turn on the BT when user press "see all" button to let user to
quick pair their disconnected devices.
- Update and add test case
Bug: 147150367
Test: make -j42 RunSettingsRoboTests
Change-Id: I7a1451a36a31253b6be2203341bea4e59fed7c2b
Merged-In: I7a1451a36a31253b6be2203341bea4e59fed7c2b
(cherry picked from commit bde100849e
)
2020-09-07 02:58:39 +00:00
Bill Yi
089ac7f7d2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba
-s ours am: de28bc7c7e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014
Change-Id: I27f9496735033b8b7d8666ceb7a66e4abeaec921
2020-09-06 20:06:51 +00:00
Bill Yi
6746ecb1c4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9a2be8b1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531015
Change-Id: Iade07158a0cb1462fbe74bfa0a8875179bc5d8bf
2020-09-06 20:06:46 +00:00
Bill Yi
13281b0aeb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba
-s ours am: 3f9c81573d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014
Change-Id: I57d32cce1ab7cb2a9acd576b1564c5dcc8c31777
2020-09-06 20:06:03 +00:00
Bill Yi
de28bc7c7e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014
Change-Id: I027479bbfa400ad6bb51b1a64d8b70e0dfb68800
2020-09-06 19:52:48 +00:00
Bill Yi
3f9c81573d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014
Change-Id: I3b5e256b0d5be8922d8716955d1744b140835122
2020-09-06 19:52:05 +00:00
Bill Yi
d9a2be8b1a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idf95416dc8ce50515dd6763c3ae24ebf89722c6a
2020-09-06 13:05:51 +00:00
Bill Yi
ee8c3875ba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0eedcd75ce4aca6fffdd86fb7da8b177c01a9696
2020-09-06 12:31:40 +00:00
Treehugger Robot
002c5b1143
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8
-s ours am: ada75ad54d
-s ours am: f75d48d9f8
-s ours am: 8b2080e7cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393
Change-Id: I69831a3612d01d0447f5a75426cce5b6f2f846a6
2020-09-05 19:43:50 +00:00
Treehugger Robot
8b2080e7cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8
-s ours am: ada75ad54d
-s ours am: f75d48d9f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393
Change-Id: Ieac8fcc9f4209d6682556ba2dd89f0191d138ffe
2020-09-05 19:31:31 +00:00
Treehugger Robot
f75d48d9f8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8
-s ours am: ada75ad54d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393
Change-Id: I8d01018b9590b293954df3c7690477b99ee72e4e
2020-09-05 18:56:42 +00:00
Treehugger Robot
ada75ad54d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393
Change-Id: I7972af3db5cb995b4a7c4deb982eeef6c3dddaad
2020-09-05 18:44:03 +00:00
Treehugger Robot
681beda2f8
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-05 18:32:54 +00:00
Treehugger Robot
f85d3b3f5f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68
-s ours am: 0749b2e5b1
-s ours am: 966f8a889b
-s ours am: 3867542239
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420390
Change-Id: I0e2e4d7c4fbab1d836706528b665b2db9d21cf21
2020-09-05 15:29:00 +00:00
Treehugger Robot
a2329d7450
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161
-s ours am: a4bfe8a50f
-s ours am: 2d241c544d
-s ours am: 52b60555b5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420392
Change-Id: I4f9a4a3b1daa382df98a7e59d99137767835c2a2
2020-09-05 15:28:54 +00:00
Treehugger Robot
9e06009c51
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897
-s ours am: 809f01fc74
-s ours am: d1b40cfb18
-s ours am: 701ea4dff8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420389
Change-Id: I29b4a1f22c5f3b566d49c5d3e2ac263edf31348e
2020-09-05 15:28:35 +00:00
Treehugger Robot
3867542239
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68
-s ours am: 0749b2e5b1
-s ours am: 966f8a889b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420390
Change-Id: I5eed324de754c4ab34a26002ce1ca122dde916f0
2020-09-05 15:17:20 +00:00
Treehugger Robot
52b60555b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161
-s ours am: a4bfe8a50f
-s ours am: 2d241c544d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420392
Change-Id: I044f323df73102f23202d6d2b3e70333fa2ef6d4
2020-09-05 15:17:13 +00:00
Treehugger Robot
701ea4dff8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897
-s ours am: 809f01fc74
-s ours am: d1b40cfb18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420389
Change-Id: I1b8b1e30adb80b033f5491a099e257fc522434ee
2020-09-05 15:17:00 +00:00
Treehugger Robot
966f8a889b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68
-s ours am: 0749b2e5b1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420390
Change-Id: Ifeeb5b1ed6feed0931e8b486485ab03cf1d37555
2020-09-05 15:02:28 +00:00