Bonian Chen
009f7ec40d
[automerger skipped] Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings" am: 3e545f2bef am: f257197d96 -s ours
...
am skip reason: Change-Id I6d7e72a656723c0620d579e1e223945e2a3588af with SHA-1 e30517f9a5 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390058
Change-Id: I7b4659c785548541a4062c4336b31b7e6b8e3ed3
2020-08-05 09:38:25 +00:00
Bonian Chen
4cd2283768
[automerger skipped] Merge "Mainline remove hide api SubscriptionInfo.getCardString" am: d3c8a4c3ee am: d03c8bfb1c -s ours
...
am skip reason: Change-Id Idb44af6a01626013339f5ca05486dd11112a5867 with SHA-1 5189dc3860 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387128
Change-Id: I63570338e4a096b494917f3bff58071e609c545f
2020-08-05 09:38:12 +00:00
Bonian Chen
f257197d96
Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings" am: 3e545f2bef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390058
Change-Id: I7754cefefd1224608fe879c36e00307d6777bc79
2020-08-05 09:20:21 +00:00
Bonian Chen
d03c8bfb1c
Merge "Mainline remove hide api SubscriptionInfo.getCardString" am: d3c8a4c3ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387128
Change-Id: I3d4187956b376cf2a8138df5cdad4263c6b7b31c
2020-08-05 09:20:10 +00:00
Bonian Chen
3e545f2bef
Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings"
2020-08-05 09:16:55 +00:00
Bonian Chen
d3c8a4c3ee
Merge "Mainline remove hide api SubscriptionInfo.getCardString"
2020-08-05 09:03:44 +00:00
Bonian Chen
9a8905db00
[automerger skipped] Merge "Mainline: removed legacy UI for network selection mode." am: 6afb84d6b2 am: 0f951e1b90 -s ours
...
am skip reason: Change-Id I1a0f431f05268d29afce145c3eb720594cfc57a3 with SHA-1 affe5406a6 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387134
Change-Id: I8934f8d9b4bd46d2cd8daf03d34c138357b1f40e
2020-08-05 07:35:15 +00:00
Bonian Chen
0f951e1b90
Merge "Mainline: removed legacy UI for network selection mode." am: 6afb84d6b2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387134
Change-Id: I8161ffae6bbe96c93dafa3328cb2fdad6614b4d9
2020-08-05 07:12:12 +00:00
changbetty
310eeebe5c
[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings
...
Bug: 147206736
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=SubscriptionUtilTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileDataSliceTest
Merged-In: I6d7e72a656723c0620d579e1e223945e2a3588af
Change-Id: I99b63b33395641ecd0b00997fa3792bbd59efeda
2020-08-05 15:08:59 +08:00
SongFerngWang
888e9cbdf9
Mainline remove hide api SubscriptionInfo.getCardString
...
Bug: 147128878
Test: build pass
Merged-In: Idb44af6a01626013339f5ca05486dd11112a5867
Change-Id: Ib222c08bc4baa3fdcaea1fa2020d7de6d6a4fcec
2020-08-05 07:07:11 +00:00
Bonian Chen
6afb84d6b2
Merge "Mainline: removed legacy UI for network selection mode."
2020-08-05 06:56:38 +00:00
Bonian Chen
0aa15f333e
[automerger skipped] Merge "[Settings] Data roaming warning only when turn ON" am: 622da45ee6 am: 05b07f424e -s ours
...
am skip reason: Change-Id I63c4e2149b0e9efa16fd9ee402652c67eb9c5a4d with SHA-1 19135546a3 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387127
Change-Id: I5bc786d8faf457d85ce90e1226a4c34a2f2752c8
2020-08-05 06:40:58 +00:00
Bonian Chen
522841a340
[automerger skipped] Merge "Removed reference to PhoneConstant PHONE_TYPE_*" am: b3b25c39c9 am: 1e328285b7 -s ours
...
am skip reason: Change-Id I286c4879d55e28707081d4cacba1a2c444f92646 with SHA-1 c3a453174e is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387126
Change-Id: I6a0cc537207cdb772ec26f347b570c14ebc9a5f4
2020-08-05 06:36:19 +00:00
Bonian Chen
05b07f424e
Merge "[Settings] Data roaming warning only when turn ON" am: 622da45ee6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387127
Change-Id: I9e2af4dda890ab5b13aa049430161eab1d602df3
2020-08-05 06:11:11 +00:00
Bonian Chen
1e328285b7
Merge "Removed reference to PhoneConstant PHONE_TYPE_*" am: b3b25c39c9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387126
Change-Id: I9389e2226554123fd25844c27aa24e6b13466124
2020-08-05 06:11:00 +00:00
Bonian Chen
622da45ee6
Merge "[Settings] Data roaming warning only when turn ON"
2020-08-05 05:58:13 +00:00
Bonian Chen
b3b25c39c9
Merge "Removed reference to PhoneConstant PHONE_TYPE_*"
2020-08-05 05:55:32 +00:00
Bonian Chen
620f9c0b28
[automerger skipped] Merge "Remove logic to manually search inactive pSIM." am: 144e2b41f5 am: f5557102c9 -s ours
...
am skip reason: Change-Id Icd131f133e47dae0770a4da71c51de3c2a94b42b with SHA-1 640e56433f is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387129
Change-Id: If56211f627d1898c14db2c7fc3ecb491ec1cdda9
2020-08-05 05:15:37 +00:00
SongFerngWang
7e045ab9f6
Mainline: removed legacy UI for network selection mode.
...
This cl base on ag/10098777. Now inserted inactive pSIM
will be included in Telephony's get available and
get selectable subInfo list so that logic is no longer
needed.
Bug: 147128878
Test: build pass
Merged-In: I1a0f431f05268d29afce145c3eb720594cfc57a3
Change-Id: I54ed8c69edcdc618f8cf8df8af0fffc8c4f187e8
2020-08-05 12:58:53 +08:00
Bonian Chen
f5557102c9
Merge "Remove logic to manually search inactive pSIM." am: 144e2b41f5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387129
Change-Id: I84e8bf96b0d58f5833e00effaee52e120f77fa98
2020-08-05 04:57:19 +00:00
Bonian Chen
144e2b41f5
Merge "Remove logic to manually search inactive pSIM."
2020-08-05 04:39:45 +00:00
Bonian Chen
0f7a0642de
[automerger skipped] Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78bfa am: 603dcc1856 -s ours
...
am skip reason: Change-Id Ic520bc34c5a460b4fcd199cd524b180d307e9ab4 with SHA-1 fb4a0c25e0 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387124
Change-Id: I715e838ade3a2eae24736c8fef55c18f21670a41
2020-08-04 11:05:32 +00:00
Bonian Chen
d35e25c295
[automerger skipped] Merge "mainline: remove CarrierConfigManager.init" am: eff795f061 am: 6a4d09c4ed -s ours
...
am skip reason: Change-Id I2a72d409574fc281e5de57d58a27551dd040d551 with SHA-1 762e193266 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387120
Change-Id: I20ef63c25a5ea334d75cbacc57664d6cb9defa29
2020-08-04 11:05:19 +00:00
Malcolm Chen
3805373f90
Remove logic to manually search inactive pSIM.
...
Nowe inserted inactive pSIM will be included in Telephony's get
available and get selectable subInfo list so that logic is no longer
needed.
Bug: 147128878
Test: unittest
Merged-In: Icd131f133e47dae0770a4da71c51de3c2a94b42b
Change-Id: I9ba5dded7817116c02d70298c9c271ff6a99925b
2020-08-04 18:57:37 +08:00
Bonian Chen
603dcc1856
Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78bfa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387124
Change-Id: Id886131d82e274572e4277ed8d8f0f61513a8d65
2020-08-04 10:41:58 +00:00
Bonian Chen
6a4d09c4ed
Merge "mainline: remove CarrierConfigManager.init" am: eff795f061
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387120
Change-Id: I79a3a67123c110eb2ccbba5c0e54598bcc99c86e
2020-08-04 10:41:43 +00:00
Bonian Chen
9057a78bfa
Merge "[Settings] Avoid crash when switch SIM during PIN lock"
2020-08-04 10:37:12 +00:00
Bonian Chen
76bd28fe60
[Settings] Data roaming warning only when turn ON
...
handlePreferenceTreeClick() goes after setChecked() however
configuration may have been altered within setChecked().
Follow same design within MobileDataPreferenceController to fix this
issue. A boolean state will be maintained as the condition when warning
dialog is required when click.
Bug: 148491064
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=RoamingPreferenceControllerTest
Merged-In: I63c4e2149b0e9efa16fd9ee402652c67eb9c5a4d
Change-Id: I2f9998e87b053c8d30af48f977ef58a7fe9ea829
2020-08-04 18:35:13 +08:00
Bonian Chen
eff795f061
Merge "mainline: remove CarrierConfigManager.init"
2020-08-04 10:20:18 +00:00
SongFerngWang
87af2abc83
mainline: remove CarrierConfigManager.init
...
Bug: 147469789
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
ApnPreferenceControllerTest (PASS)
make RunSettingsRoboTests ROBOTEST_FILTER=\
CarrierPreferenceControllerTest (PASS)
Merged-In: I2a72d409574fc281e5de57d58a27551dd040d551
Change-Id: I2535275d116887ed4b107fc530c85b4cbc5ad0d5
2020-08-04 10:18:54 +00:00
Lee Chou
68c0ba35ec
Removed reference to PhoneConstant PHONE_TYPE_*
...
replaced with TelephonyManager.PHONE_TYPE_*
Bug: 147469330
Test: m RunSettingsRoboTests
Merged-In: I286c4879d55e28707081d4cacba1a2c444f92646
Change-Id: I9941b1ce438a06d05af0276bff2e769ec5e3d438
2020-08-04 18:15:42 +08:00
Sunny Shao
3a4190e88b
[automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 573599b628 -s ours am: b2eac1654f -s ours am: e615d96b9b -s ours am: 6a0a44ba16 -s ours am: 5181948f08 -s ours am: bd78f5d4d3 -s ours am: c101eac32b -s ours
...
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12069381
Change-Id: I709be3782695c218f6181a4616274f0ee9a1a2a0
2020-08-04 10:04:32 +00:00
Jakub Pawlowski
3afa3cd405
Prevent overlay drawing on top of Bluetooth discovery request dialog am: ac67100423 am: 2094f01676 am: 0b7ce7660c am: fa8d015bdb am: 682c00d893 am: 62ec2b5aa0 am: 01251764ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057
Change-Id: I90a57cb2ab6b711340dca70b2603142ac35c1b59
2020-08-04 10:04:25 +00:00
Jakub Pawlowski
4f1d128ffa
Prevent overlay drawing on top of Bluetooth pairing dialog am: 3f5bf02fd8 am: a0c963ba95 am: 368fc30e37 am: 988d9633c2 am: ea460a8527 am: 7d38515814 am: a4e4323fc1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056
Change-Id: I82ae35fe6d68226196afbd9b286663ce8ddb12aa
2020-08-04 10:04:13 +00:00
Sunny Shao
566e54e616
[automerger skipped] Allows to launch only authenticator owned activities am: 4b6e82fd5d am: fcc0b2872d -s ours am: e791be54f2 -s ours am: 83cadecf04 -s ours am: 0240abd711 -s ours am: fd9977a094 -s ours am: a1e734b558 -s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489506
Change-Id: I36d6d56ea0aaa4b29c61abd55d10585073c90164
2020-08-04 10:04:01 +00:00
Mill Chen
d988a5ca4d
[automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4ac2 -s ours am: 5045f120af am: 7bdd4b3273 -s ours am: 5f16b03f50 -s ours am: c54d68ea09 am: d3abc029bc -s ours am: 57f93997d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10420450
Change-Id: If98a865f028db60cd8296a0908961cd57971d2e8
2020-08-04 10:03:51 +00:00
Mill Chen
1202e45210
[automerger skipped] Prevent accounts page directly opening in screen pinning mode am: 6c2f32b3ae -s ours am: a6a08263f2 am: 1958831a8c am: 5c7ca93bf1 am: 2bbc2529a8 am: 60d8cc727d am: a2ef19bb97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781
Change-Id: Ie2f81dfd67f925b486c54373c5ae4831fcc705e3
2020-08-04 10:03:37 +00:00
Sunny Shao
c101eac32b
[automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 573599b628 -s ours am: b2eac1654f -s ours am: e615d96b9b -s ours am: 6a0a44ba16 -s ours am: 5181948f08 -s ours am: bd78f5d4d3 -s ours
...
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12069381
Change-Id: Ia7925c9f57cbdc466b70e5eead64fa6893e0505c
2020-08-04 09:50:05 +00:00
Jakub Pawlowski
01251764ce
Prevent overlay drawing on top of Bluetooth discovery request dialog am: ac67100423 am: 2094f01676 am: 0b7ce7660c am: fa8d015bdb am: 682c00d893 am: 62ec2b5aa0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057
Change-Id: I153ff348050ceed6fa537556af9a4a20e6e576f3
2020-08-04 09:49:58 +00:00
Jakub Pawlowski
a4e4323fc1
Prevent overlay drawing on top of Bluetooth pairing dialog am: 3f5bf02fd8 am: a0c963ba95 am: 368fc30e37 am: 988d9633c2 am: ea460a8527 am: 7d38515814
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056
Change-Id: I51ea53ecb1179f5400de44a7731ec8c49f94b07b
2020-08-04 09:49:46 +00:00
Sunny Shao
a1e734b558
[automerger skipped] Allows to launch only authenticator owned activities am: 4b6e82fd5d am: fcc0b2872d -s ours am: e791be54f2 -s ours am: 83cadecf04 -s ours am: 0240abd711 -s ours am: fd9977a094 -s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489506
Change-Id: I470e499d7105907f1fac9e6cc981c2169fa7e9db
2020-08-04 09:49:34 +00:00
Mill Chen
57f93997d7
[automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4ac2 -s ours am: 5045f120af am: 7bdd4b3273 -s ours am: 5f16b03f50 -s ours am: c54d68ea09 am: d3abc029bc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10420450
Change-Id: Icf99abb9f25670dbf0ac8c0d39cda13b4c364b6d
2020-08-04 09:49:25 +00:00
Mill Chen
a2ef19bb97
[automerger skipped] Prevent accounts page directly opening in screen pinning mode am: 6c2f32b3ae -s ours am: a6a08263f2 am: 1958831a8c am: 5c7ca93bf1 am: 2bbc2529a8 am: 60d8cc727d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781
Change-Id: I49a559bb82b177428436974d350e9db8fea6eee8
2020-08-04 09:49:18 +00:00
Bonian Chen
7940c0253f
[Settings] Avoid crash when switch SIM during PIN lock
...
PIN lock status are stored without subscription ID mapping on it.
Which makes SIM status change can't be processed correctly.
Through storing the subscription ID for PIN lock screen, dialog can be
reset when SIM status changed and crash can be avoided.
Bug: 155852345
Test: manual
Merged-In: Ic520bc34c5a460b4fcd199cd524b180d307e9ab4
Change-Id: I8137c1e4d8f7f9d0e8d201fc9b7e277871ef5add
2020-08-04 17:44:42 +08:00
Sunny Shao
bd78f5d4d3
[automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 573599b628 -s ours am: b2eac1654f -s ours am: e615d96b9b -s ours am: 6a0a44ba16 -s ours am: 5181948f08 -s ours
...
am skip reason: Change-Id I85842db3faa558ea61bc878ca76ff6d8ce1a4b03 with SHA-1 7359b3840f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12069381
Change-Id: I0e5bf45db7c2dbefd97abc3b8c5ecf27ad3c5384
2020-08-04 09:26:37 +00:00
Jakub Pawlowski
62ec2b5aa0
Prevent overlay drawing on top of Bluetooth discovery request dialog am: ac67100423 am: 2094f01676 am: 0b7ce7660c am: fa8d015bdb am: 682c00d893
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057
Change-Id: I63e13505e4cb6b71a23e8c595f3a25a49a447360
2020-08-04 09:26:31 +00:00
Jakub Pawlowski
7d38515814
Prevent overlay drawing on top of Bluetooth pairing dialog am: 3f5bf02fd8 am: a0c963ba95 am: 368fc30e37 am: 988d9633c2 am: ea460a8527
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056
Change-Id: I78b06e18283d2f97f487034f8a6bffb643f764a0
2020-08-04 09:26:19 +00:00
Sunny Shao
fd9977a094
[automerger skipped] Allows to launch only authenticator owned activities am: 4b6e82fd5d am: fcc0b2872d -s ours am: e791be54f2 -s ours am: 83cadecf04 -s ours am: 0240abd711 -s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489506
Change-Id: I6aafec7fbfb55363d68b009d2d214b817186eeec
2020-08-04 09:26:08 +00:00
Mill Chen
d3abc029bc
[automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4ac2 -s ours am: 5045f120af am: 7bdd4b3273 -s ours am: 5f16b03f50 -s ours am: c54d68ea09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10420450
Change-Id: I68bfa361d10e8a1b56afa414bc570ca87ae6754a
2020-08-04 09:26:02 +00:00
Sunny Shao
e308bf80e8
[automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 7359b3840f -s ours am: b37bad4181 am: cd6166b086 am: b20ae29aad -s ours am: 3502b36487 -s ours
...
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065565
Change-Id: I21da18e319b76b9059bc45d5f764c53f2dc17fa0
2020-08-04 09:25:59 +00:00