Commit Graph

62442 Commits

Author SHA1 Message Date
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
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
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
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
Mill Chen
60d8cc727d [automerger skipped] Prevent accounts page directly opening in screen pinning mode am: 6c2f32b3ae -s ours am: a6a08263f2 am: 1958831a8c am: 5c7ca93bf1 am: 2bbc2529a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781

Change-Id: Ic48f21cdc4366c8a43bd74b5f0bf67cae0d48c54
2020-08-04 09:25:47 +00:00
Sunny Shao
5181948f08 [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 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: Ice249457ed0a3143ea8b494087052567789935b2
2020-08-04 09:04:48 +00:00
Jakub Pawlowski
682c00d893 Prevent overlay drawing on top of Bluetooth discovery request dialog am: ac67100423 am: 2094f01676 am: 0b7ce7660c am: fa8d015bdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057

Change-Id: I9d95c5c44b0d6379ae3732ba1687c86ad8ab1b6d
2020-08-04 09:04:40 +00:00
Jakub Pawlowski
ea460a8527 Prevent overlay drawing on top of Bluetooth pairing dialog am: 3f5bf02fd8 am: a0c963ba95 am: 368fc30e37 am: 988d9633c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056

Change-Id: I531919ef123c1aa829a26a595fcf0d6544ef2578
2020-08-04 09:04:14 +00:00
Sunny Shao
0240abd711 [automerger skipped] Allows to launch only authenticator owned activities am: 4b6e82fd5d am: fcc0b2872d -s ours am: e791be54f2 -s ours am: 83cadecf04 -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: Idd2cdb719c044148bd3bf099a4397652f040083d
2020-08-04 09:03:27 +00:00
Mill Chen
c54d68ea09 [automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4ac2 -s ours am: 5045f120af am: 7bdd4b3273 -s ours am: 5f16b03f50 -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: Iee5c21fab842219b73c82ae3f0a62673e1430de5
2020-08-04 09:03:04 +00:00
Mill Chen
2bbc2529a8 [automerger skipped] Prevent accounts page directly opening in screen pinning mode am: 6c2f32b3ae -s ours am: a6a08263f2 am: 1958831a8c am: 5c7ca93bf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781

Change-Id: If7237344621406198999bcbdbd810a40bbe98a09
2020-08-04 09:02:24 +00:00
Sunny Shao
3502b36487 [automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 7359b3840f -s ours am: b37bad4181 am: cd6166b086 am: b20ae29aad -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: Ie32961e78e37bbfed718a5b75b3189e715a51f1b
2020-08-04 09:01:05 +00:00
Sunny Shao
6a0a44ba16 [automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 573599b628 -s ours am: b2eac1654f -s ours am: e615d96b9b -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: I001b0d88f1cbc4cf793639fab87df0c54379632c
2020-08-04 08:48:50 +00:00
Jakub Pawlowski
fa8d015bdb Prevent overlay drawing on top of Bluetooth discovery request dialog am: ac67100423 am: 2094f01676 am: 0b7ce7660c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057

Change-Id: I558bc394013060be07bc4fb76b0e394f8b1e513b
2020-08-04 08:48:41 +00:00
Jakub Pawlowski
988d9633c2 Prevent overlay drawing on top of Bluetooth pairing dialog am: 3f5bf02fd8 am: a0c963ba95 am: 368fc30e37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056

Change-Id: I8e629bb072063071da36122eedfeb779ce9407fb
2020-08-04 08:48:31 +00:00
Sunny Shao
83cadecf04 [automerger skipped] Allows to launch only authenticator owned activities am: 4b6e82fd5d am: fcc0b2872d -s ours am: e791be54f2 -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: I130a98ea9e2d07fd48c2c8acaa4602a2bd6249f0
2020-08-04 08:48:22 +00:00
Mill Chen
5f16b03f50 [automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4ac2 -s ours am: 5045f120af am: 7bdd4b3273 -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: I6515961532875a1030dff6d99660017acdbc35e1
2020-08-04 08:48:16 +00:00
Mill Chen
5c7ca93bf1 [automerger skipped] Prevent accounts page directly opening in screen pinning mode am: 6c2f32b3ae -s ours am: a6a08263f2 am: 1958831a8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781

Change-Id: Id92037ce698599cb422700f9bafd7f1f54e45779
2020-08-04 08:48:03 +00:00
Sunny Shao
e615d96b9b [automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 573599b628 -s ours am: b2eac1654f -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: I2df4dc15510dd99bc6e340f7d56157c9d1b58c2b
2020-08-04 08:37:13 +00:00
Jakub Pawlowski
0b7ce7660c Prevent overlay drawing on top of Bluetooth discovery request dialog am: ac67100423 am: 2094f01676
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057

Change-Id: If2705f0429762a44a67e5c13c1010386842554ee
2020-08-04 08:37:06 +00:00
Jakub Pawlowski
368fc30e37 Prevent overlay drawing on top of Bluetooth pairing dialog am: 3f5bf02fd8 am: a0c963ba95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056

Change-Id: I3a9ba7c421a22ab231c4e0efbdafedce2d597c3f
2020-08-04 08:36:55 +00:00
Sunny Shao
e791be54f2 [automerger skipped] Allows to launch only authenticator owned activities am: 4b6e82fd5d am: fcc0b2872d -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489506

Change-Id: I0f79390984816190b0245d78a1fd88661aa8d048
2020-08-04 08:36:45 +00:00
Sunny Shao
b2eac1654f [automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 573599b628 -s ours
am skip reason: skipped by user sunnyshao

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12069381

Change-Id: I734ec4aed22c2c1c627c0a8939de58a98a85dc83
2020-08-04 08:36:45 +00:00
Mill Chen
7bdd4b3273 [automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4ac2 -s ours am: 5045f120af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10420450

Change-Id: I69295da904c05b9e959ab50f0388bffd624b39cd
2020-08-04 08:36:35 +00:00
Sunny Shao
b20ae29aad [automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 7359b3840f -s ours am: b37bad4181 am: cd6166b086
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065565

Change-Id: I4e9c9c8f2f969d74b0d65fe81620d997439d9fc2
2020-08-04 08:36:30 +00:00
Jakub Pawlowski
2094f01676 Prevent overlay drawing on top of Bluetooth discovery request dialog am: ac67100423
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057

Change-Id: I473a3833214ce9dcee8679abbddd513145e2b26c
2020-08-04 08:20:38 +00:00
Jakub Pawlowski
a0c963ba95 Prevent overlay drawing on top of Bluetooth pairing dialog am: 3f5bf02fd8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056

Change-Id: I19d59712eb08c4171d0b4c9a3646e36011bed1d5
2020-08-04 08:20:29 +00:00
Sunny Shao
fcc0b2872d Allows to launch only authenticator owned activities am: 4b6e82fd5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489506

Change-Id: I6947d37693042f278aba9774ca5e3a3e954ed845
2020-08-04 08:20:20 +00:00