Commit Graph

207 Commits

Author SHA1 Message Date
Jeremy Goldman
fb41503ca8 SimSelectNotification pending intent include an Immutable flag
Bug: 172212792
Test: atest SettingsUnitTests
Change-Id: Id40e145eed1d268e8147ad21d9b9147268a20453
2021-01-12 16:46:58 +08:00
Ashwini Oruganti
2f349da025 Bulk apply PendingIntent.FLAG_MUTABLE_UNAUDITED.
We've been working hard to require PendingIntents explicitly declare
if they allow their contents to be mutated or not, and to finish
landing that work this change applies the new FLAG_MUTABLE_UNAUDITED
flag to all remaining code locations until they can be manually
inspected.

Bug: 160794467
Test: manual
Change-Id: I7b9ef5dcd35187facef1ec424589b81f834f23c0
2021-01-08 13:14:05 -08:00
Malcolm Chen
1305cee98e Automatically dismiss SIM combination warnings and selection dialogs.
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
Merged-In: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
2020-12-15 16:45:27 -08:00
Malcolm Chen
3ad8509b15 Automatically dismiss SIM combination warnings and selection dialogs.
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
2020-12-14 11:55:07 -08:00
Jiashen Wang
7629de08dd [SIM Dialog Migration] Sending push notification after DSDS reboot
After DSDS reboot, send a push notification to users for SIM
configration.

Design: https://docs.google.com/document/d/1wb5_hoBkZVbkXGNWHbx4Jf61swjfxsJzkytiTzJosYo/edit?usp=sharing
Bug: 160819390
Test: Manually tested eSIM profile enabling.
Change-Id: Ic0bf2e356bf208d16e2c5a9a380e542fcb8f2b1e
2020-11-30 20:47:39 -08:00
Jiashen Wang
610060c896 Initial setup for slot change receiver migration
Initial setup for migrating SlotChangehandler from LPA to Settings
Bug: 160819212
Bug: 153811431
Test: Manually tested pSIM insertion and removal

Change-Id: I3009182db4c6e1863dc9b619e21a17b1297743ed
2020-11-18 13:24:36 -08:00
Treehugger Robot
ae268ea40d Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38 am: 91286c4ec9 am: 368ae3f9b9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948

Change-Id: I30981eb4d451fc77ba7ee08b9ad734a392c27fca
2020-09-12 03:02:52 +00:00
Jeremy Goldman
9e1e47fef7 Add goldmanj to settings owners files.
Test: N/A, code not edited.
Change-Id: I23a64e52d01ebeda1509d1e207200d868444d955
2020-09-11 18:55:46 +00:00
changbetty
7eb7f6c795 Add setPackage for PendingIntent in SimSelectNotification
Bug: 153556754
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=SimSelectNotificationTest

Change-Id: I919bbc92df24b5557b3d95c342b330075153a9cd
2020-07-30 23:29:51 +08:00
Peter Wang
2fa2d083c7 Hide unprovisioned MDN (phone number) at select profile dialog
Bug: 151773922
Fix: 151773922
Test: Build
Change-Id: If84600cc426fefcdd219c4a44a5510b8db5c0a89
2020-04-01 19:14:18 -07:00
changbetty
f4d2771526 [Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline
Bug: 147206736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DisabledSubscriptionControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSwitchControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=SimSelectNotificationTest

Change-Id: If740c2d7ea2c1392d5fe538091ea6e5c4575ad26
2020-01-08 15:48:33 +08:00
zoey chen
af4b43535f [Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId
Bug: 146823458
Test: make
Change-Id: I437a6e325112bf9d031a4eb11c28cb755c085bee
2019-12-25 15:05:27 +08:00
Automerger Merge Worker
107cd136a3 Merge "[Settings] Adopting public API" am: 8ddd0da0a1 am: 40d2a2dd8d am: 11fa77b023
Change-Id: I87282b78a9db6eb3611591f0c4702447b8470db4
2019-12-16 08:31:03 +00:00
Bonian Chen
1247771b88 [Settings] Adopting public API
Replace SubscriptionManager#getActiveSubscriptionInfoList(true) by
SubscriptionManager#getActiveSubscriptionInfoList() since they're
equivalent.

Bug: 146312766
Test: build pass
Change-Id: Iab8a141277e0199f75a3419527e15d63669224fc
2019-12-16 06:35:43 +00:00
Pinyao Ting
e6c023bed4 Revert "[Setting] Cleanup Unused SimSettings"
This reverts commit 0d9d341932.

Reason for revert: Potential culprit for b/146229292 - verifying through Forrest before revert submission

Change-Id: I29a3ed1a44ea324e0fa88cda2e5baecb441f7922
2019-12-13 23:44:06 +00:00
Bonian Chen
0d9d341932 [Setting] Cleanup Unused SimSettings
There's no entry to access SimSettings.
Remove this unused UI.

Bug: 131324863
Test: manual
Change-Id: Ic55161ab47ae8673caf774cc49914f3741569fab
Merged-In: I3f50e528eb409215371a125184502d3531bad0a8
2019-12-13 13:46:07 +00:00
Bonian Chen
3b8d0faeed [Settings] Remove unused SimPreferenceDialog
Remove unused SimPreferenceDialog

Bug: 143018062
Test: build pass
Change-Id: Ia1b9d64a7956c8fe326d7df7635c7910cfd09951
2019-10-20 22:56:32 +08:00
Bonian Chen
5cc9aad7a8 [Setting] Cleanup Unused SimSettings
There's no entry to access SimSettings.
Remove this unused UI.

Bug: 131324863
Test: manual
Change-Id: I3f50e528eb409215371a125184502d3531bad0a8
2019-10-20 09:01:30 +00:00
TreeHugger Robot
d48189c564 Merge "Use SettingsLib Indexable" 2019-09-26 06:51:17 +00:00
Bonian Chen
2d41dbf141 [Owner] Add allenwtsu into Settings Telephony part
Add allenwtsu into owner list of Telephony part within Settings apk

Bug: 0
Test: none
Change-Id: Ic2820bc113bc26fc0d162c42c7925477177127ae
2019-09-25 21:26:44 +08:00
Raff Tsai
966fa01423 Use SettingsLib Indexable
- Use SettingsLib Indexable
- Directly use resource id in getPreferenceScreenResId

Bug: 135053028
Test: roboletric
Change-Id: I05f493b55e8b6e2091301e9231ba5615215618e6
2019-09-25 18:24:56 +08:00
Raff Tsai
ac3e0d0988 Directly use BaseIndexableProvider
- Add function getXmlResourceId, Fragments don't need to write
xml resource id twice.
- Remove getPreferenceControllers from Indexable.java. Because it will
move to SettingsLib later for other apps which don't need this function

Bug: 135053028
Test: robolectric
Change-Id: I1e74519aecdea3dde64a5aea79f08d766dbc0003
2019-09-24 00:35:52 +08:00
Bonian Chen
4ac6f1a781 Merge "[Help Page] Support help content under 2 CDMA SIM" into qt-qpr1-dev am: 20290d0451
am: 3cce668981

Change-Id: I16c4e2ef30bd62acec5d4b54fe57ac1ff25dbb90
2019-09-19 13:32:01 -07:00
Bonian Chen
fad5a00b84 [Help Page] Support help content under 2 CDMA SIM
Fix the design for displaying help content.

Launch help content from notification (PendingIntent) could not be resolved correctly.
Route through HelpTrampoline to fix it.

Bug: 139040358
Test: Manual with fake from framework side for dual CDMA SIM
Change-Id: Iff3a6e9095c3908b3c5b1a25e2535bcab1858ae2
2019-09-18 22:20:25 +00:00
Edgar Wang
99bc55da73 Add OWNER for deviceinfo/network/sim package.
Bug: 139881606
Test: None
Change-Id: If265c51360675d44bfce8d4790d1bf8d4207fc46
2019-08-23 03:06:20 +08:00
Raff Tsai
cf1489891a Remove useless png and add vector drawable
Bug: 139336138
Test: visual
Change-Id: I5ccf4855b63f47b138a1662317d0c4ba8ce8984c
2019-08-15 18:04:49 +08:00
Antony Sargent
6a1d7e60ac Add a listener for subscription changes to SimDialogFragment
For some kinds of telephony changes that might happen while we're
already showing one of these dialogs, we already get sent a new intent
for the dialog which we internally convert into a refresh of the dialog
contents instead of stacking a new copy on top of the old one.

But it turns out there are some other cases where the telephony stack
doesn't send a new intent for the dialog but *does* send a change event
through the SubscriptionManager, and we want to respond to those as
well. This CL adds a listener for those events.

Fixes: 135276696
Test: make RunSettingsRoboTests
Change-Id: Ifb93ae95f45fda5831e112306dd9361ccaa5119c
2019-06-19 12:20:59 -07:00
Antony Sargent
37008824e6 Use displayName instead of operator name in MMS data notification
When the phone is in DSDS mode and the user tries to send an MMS message
from the SIM that isn't the default for data, we need to pop up a
notification letting them know that the action can't succeed unless they
turn on the advanced option to allow data use for MMS messages. This
notification was using the operator name instead of the subscription
display name, so it didn't reflect any renaming the user might have done
to keep track of their SIMs, which is obviously confusing especially if
they have two different SIMs for the same carrier. This CL switches to
using the subscription display name in this notification.

Fixes: 134771858
Test: make RunSettingsRoboTests
Change-Id: I6995bf9dd6d5e9544e26f0d8e30e97c4e73ab783
2019-06-18 21:54:22 +00:00
Malcolm Chen
57badc2a82 Triggering notifications when dual CDMA SIM combinations are detected
In Settings, catch the intent from Telephony about SIM combination
warning and show a notification about it.

Bug: 132631355
Test: manual - have two cdma capable subscriptions active, make sure
the notification is sent, and tapping on it leads to the helper page.

Change-Id: Ifd0e13781e4afc3bfd82415b3e51fd10176d9f9d
2019-06-04 17:11:09 -07:00
sqian
36e11d2249 Add AutoCancel Notification UI for sim change
Bug: 131380487
Test: manual
Change-Id: Iaf1b1216e358683906b683c688828236f3282cf9
2019-05-21 18:45:14 +00:00
Brad Ebinger
d206835fe3 Allow SimDialogActivity to be started for result
In Telephony, we sometimes need to be able to launch
the SIM pick dialog activity for SMS without setting
a new default (i.e. user chose "ask every time") for
default SMS subscription.

Adds the ability for the SimDialogActivity to be
called using startActivityForResult and not set the
user's choice as the default.

Bug: 130853716
Bug: 130567323
Test: run Telephony SmsManagerTestApp
Change-Id: If9f9ebbfe9b7b6718ed759937abbcfa6d22c6295
2019-05-10 18:29:54 +00:00
Malcolm Chen
7dd82f966c Create enable MMS notification.
Adding a notification in SimSelectNotification that will be triggered
when receiving a enable MMS request. Tapping on the notificaiton will
lead to the subscription setting page.

Bug: 130222866
Test: manual -- have a test app that sends the intent when mobile
data is turned off. And verify that the heads-up notificaiton is shown
and that it will lead to subscription setting page.

Change-Id: Ia80e8e5ab20adf78a31647a23cb2ba8dac690e41
2019-04-29 18:49:27 +00:00
TreeHugger Robot
d414c64dc3 Merge "Include always ask button in SIM picker dialog" into qt-dev 2019-04-25 21:02:13 +00:00
Fan Zhang
e83d718ff9 Include always ask button in SIM picker dialog
Fixes: 129433330
Test: manual
Change-Id: Ia7e5af56541aaf66df9e1749c1cc6e7f97d55a0b
2019-04-24 14:11:50 -07:00
Andrew Sapperstein
181a8fccbd Update "ask every time" asset.
Fixes: 130550869
Test: visually inspected
Change-Id: I75356f1a05411ab9d4c396d283fd555ce7c1cd07
2019-04-24 12:56:17 -07:00
Fan Zhang
5c9db0cb5e Fix CodeInspectionTest
Fixes: 130897640
Test: robo
Change-Id: Ic2d952e4d76bb0a2be6eab7ddc999b56656132a6
2019-04-19 14:14:51 -07:00
TreeHugger Robot
01b633275a Merge "Fix problem of multiple stacked copies of "Select SIM" dialog" into qt-dev 2019-04-16 08:30:30 +00:00
Antony Sargent
a7dc277459 Fix problem of multiple stacked copies of "Select SIM" dialog
The SimDialogActivity is used to ask the user questions about which SIM
card to use for various services like calls, SMS, and data. In some
cases of SIM changes (eg when a SIM is added or removed), the telephony
stack sends a broadcast that SimSelectNotification listens for so it can
pop up a general "SIM cards changed" notification, and we additionally
want to bring up an interruptive dialog to ask the user a specific
question. This might happen for instance when we want to ask the user's
permission to turn on data on a SIM.

Recent DSDS changes in the telephony stack have meant that we
accidentally create several stacked copies of this dialog, because they
send several broadcast updates as information about SIMs asynchronously
changes. For instance, we might initially detect a SIM with a generic
name of "CARD 1", and shortly after discover the actual carrier name. So
what we really want is to put up the dialog, and update it as
information changes.

This CL makes SimDialogActivity use launchMode="singleTop" so that
additional copies of the activity won't be launched. Then it internally
enforces only showing one dialog per type of request (calls, SMS, data,
or preferred sim). If we get a request for a dialog that already exists,
we just update it instead of creating a new one for that type. So there
can still be a stack of more than one dialog, but each one will be
asking a different question.

This also refactors the monolithic, somewhat confusing code for showing
the various types of dialogs into a more clearly separated class
hierarchy, and switches to using DialogFragment for the dialog.

Fixes: 126596081
Test: manual (start with device in DSDS mode with 2 subs, remove SIM
card and re-insert it)

Change-Id: I0dbc41dc3b15015389823a24df10bbff08ec6615
2019-04-15 06:16:52 -07:00
Antony Sargent
8eb1660da7 Update intent in SimNotification
When you add/remove a SIM, telephony notifies settings and we pop up a
notification. Tapping on that notification was still leading to our old
SIM cards page, but should instead lead to the Network & internet page
where we've added a bunch of new UI for doing the same sorts of
operations.

Bug: 128859223
Test: manual (remove a SIM or add a SIM in DSDS mode; a notification
telling you that sim cards have changed should pop up, clicking that
should lead to Network & internet page in settings)

Change-Id: I9c1e656dcc3e8fc9147bb99861d8fdc15ed09be9
2019-04-12 16:10:52 -07:00
Xiangyu/Malcolm Chen
84c5751ceb Merge "Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED." 2019-03-28 22:39:54 +00:00
Antony Sargent
85717d9f8d Use better string in dialog asking which SIM to use for SMS
Right now when you have a dual-SIM device but no default set for which
one to use for SMS, when you go to try and send an SMS you'll get a
dialog asking which SIM to use with the generic string of "Select a SIM
card". We recently added a more specific string for this in a separate
CL, which reads "Select a SIM card for SMS". This CL switches the code
to use that more specific string.

Bug: 129021763
Test: compile / manual
Change-Id: I7d12a7191de23366b0a6b6888021e57ff9ddced9
2019-03-28 10:31:36 -07:00
Malcolm Chen
a05e6f8182 Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED.
Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED in manifest.
Also, make sure SimSelectNotification only listens to that intent.

Bug: 128645056
Test: manual
Change-Id: I008e5346ff1e015d1aa57ca31844426e33bd99b8
2019-03-27 17:53:22 -07:00
Malcolm Chen
f2fca31c51 Clean up a few names of Telephony intent extra.
Bug: 128645056
Test: build
Change-Id: I5d47b132abb722282bd10b9fbb362fb1f1d32f11
2019-03-22 18:03:42 -07:00
Xiangyu/Malcolm Chen
c7b392959e Merge "Move SIM select logic from SimSelectNotification to Telephony." 2019-03-22 06:48:23 +00:00
chen xu
96d0c484f3 Create TM for each subId to register phonestatelistner
To register phonestatelistner for different subscription, do not
create phonestatelistener(subId) this contructor is going to be removed.
instead, create TelephonyManager instance for each subId and pass
separate phonestateListener object.

Bug: 117555407
Test: Maunal test
Change-Id: Ia2a1be6e559c3a5b98e178a02d0eee14cc14eb47
2019-03-20 17:28:26 -07:00
Malcolm Chen
41855ec8b9 Move SIM select logic from SimSelectNotification to Telephony.
SimSelectNotification used to listen to SIM_STATE_CHANGED from Telephony
and do checkings to decide whether to pop up notification and
SimDialogActivity. The logic needs updated and only Telephony knows it
well. So this change moves the logic into Telephony. SimSelectNotification
only listens to Telephony's decision, brings up notification and trigger
SimDialogActivity.

Bug: 128645056
Test: sanity and manual
Change-Id: I6153e27dd00dd9cdf8682f135eb39f8af3a75608
2019-03-19 13:57:19 -07:00
Malcolm Chen
e8fabb522a Enable data when user selects default data through popped up dialog.
In DSDS device, when user explicitly selects a SIM as data SIM, we
should not only set it as default data SIM in Telephony, but also
enable its data.

Bug: 120712558
Test: manual
Change-Id: I429efa090ebf5bb71ee491ae66525abee00f62c6
2019-02-06 15:23:23 -08:00
Fan Zhang
31b210017b Migrate all MetricsProto enums to SettingsEnums
Bug: 122855168
Test: rebuild
Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76
2019-01-17 14:55:42 -08:00
Malcolm Chen
14dde50c3a Don't show hidden Cellular subscription in Settings.
Replace getActiveSubscriptionInfoList() with
getActiveSubscriptionInfoList(true) so that settings will not show
hidden subscriptions to the user in various pages.

Bug: 121396526
Test: manual
Change-Id: I717999fed7d3a5a037914239694bef52df7c6207
2019-01-16 00:21:30 -08:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00