Commit Graph

46 Commits

Author SHA1 Message Date
fionaxu
1bf6ec2f86 cold sim clean up
- add a new field: provisioningNotificationEnabled from NetworkMisc. set
  to false if we want to hide "sign in" notification and placed
  carrier-specific notification instead. it is set on connect, once set,
  it is carrier-app's responsibility to post new UI to users
- rework on the interaction between carrier app and framework
- code cleanup
- unit test support

Bug: 28567303
Change-Id: Ic84db7ffbb920d15344717f104496d3cb82e1a85
2016-06-03 11:45:12 -07:00
fionaxu
b5592dc9f4 Cold Sim issue fix
Bug: 25203607
Change-Id: Ibde6a483477cb7c94f75b656d5e41748b13b23b2
2016-04-19 14:24:56 -07:00
Sandeep Gutta
e1da5a3964 Handle mnc 00 while retrieving the Resources based on subid
Since mnc 00 is represented as undefined it needs to be replaced
with MNC_ZERO 0xffff for retrieving proper resources.

bug:28219719
Change-Id: I7e1630c2f5c31959306d862b10e7987bb449ea9f
2016-04-15 22:46:09 +00:00
Shishir Agrawal
7ea3e8bf89 Unhiding MSIM APIs.
1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
   APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: Ibebab7379ea79c8e4812bbd190342827048e30e2
2016-01-26 13:47:27 -08:00
Amit Mahajan
ca1bdcfd70 Revert "Added constructor with looper param for OnSubscriptionsChangedListener"
This reverts commit 831e401c05.

Not needed now since tests create HandlerThread

BUG=25691379
Change-Id: Ic0ac3e3ef3c717fd31acb5fc8d6d81cc9995a2f7
2016-01-19 22:46:34 +00:00
Amit Mahajan
831e401c05 Added constructor with looper param for OnSubscriptionsChangedListener
This is needed for tests as subclasses may need to specify which
looper to use.

Bug: 25691379
Change-Id: Ia6eb2d34c439b420ef81622e3c8ff50a0290da22
2016-01-12 16:14:22 -08:00
Jack Yu
d2cf0ce9c1 Reduced the radio log
Reduced the radio log by moving some to VDBG or merging few lines
into one.

bug: 25956251
Change-Id: I290d894e95c9fdd664db35fd0cee3536c37dbd20
2015-12-30 12:06:01 -08:00
Jack Yu
6714030083 merge from master
Change-Id: Ic03669db3f4595336a7dbc13ffc77d055d11acf9
2015-12-10 12:27:58 -08:00
Sanket Padawe
dc49309cef Add new API for handling DB query per subId.
+ Add new API for handling DB query and Resources object per subscription.
+ Add constants for column name of DB storing subscription info.
+ Add a common settings file for multi-tab

Bug: 22360525
Change-Id: Icf6d35bdbe31618e2a95df450aee12b99d3aea7a
2015-07-14 14:21:43 -07:00
Robert Greenwalt
278b8f9509 Add/Fix Permission check on SubscriptionManager.
Things that are modifing should check the modify permission.

bug: 19259681
Change-Id: I27c7501d6777deec902b9cd47e194eadef391869
2015-07-06 15:16:46 -07:00
Sanket Padawe
330dcac0cb SubscriptionManager: Fix NPE in getSimStateForSlotIdx
bug: 21915589
Change-Id: If703baff6408a0d7ba7c8b02bfd2427b64cda963
2015-06-18 12:08:01 -07:00
Amit Mahajan
9387f1dfe3 Changing getSimState to use slot idx instead of sub id.
Bug: 20736251
Change-Id: I43ec6450358f833f878ed4eee993ea79d5220c65
2015-06-08 17:01:23 +00:00
Sanket Padawe
28964eb236 Suppress default logging in SubscriptionManager.
Bug: 20465753
Change-Id: Ieeb493be7b32382c6adf1cf0664cf3e96cedace7
2015-06-05 16:13:51 -07:00
Prerepa Viswanadham
b6f9da0b7f Merge commit '17455a3' into master_merge 2015-05-01 10:12:11 -07:00
Svet Ganov
21301f6016 Add OP_READ_PHONE_STATE app op continued - framework
Change-Id: If1c2783ad9ea2aa773e5416e09a3cfd1817ef73f
2015-04-18 22:49:28 -07:00
Svet Ganov
16a1689950 Add OP_READ_PHONE_STATE app op - framework
The READ_PHONE_STATE permission protects PII information and
is in the Phone group. This change is adding the corrseponding
app op for gating access to the API guarded by READ_POHNE state
which will be used instead as an access control for legacy apps.

Change-Id: I2ff895a5a0e529f26ec0ad706266a30d829268ba
2015-04-17 20:43:56 +00:00
Shishir Agrawal
0ced792cd6 Fail SmsManager requests if SubId is not active.
If subId is not active, expected subIds can be assigned to the messages being
processed due to SmsManager calls. The change will fail any SmsManager calls
if SubId is not active.

Bug: 18629526
Change-Id: I8da1b1e2c477f32dcbaff417fc4e14ba2a225414
2015-03-30 14:11:07 -07:00
John Spurlock
08c7116ab9 Remove unused imports in frameworks/base.
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
2015-02-28 14:47:49 -05:00
Legler Wu
85973dcf8c [DS] Correct the access method for telephony system property
Revise the method to access telephony system property.
Add several PROPERTY_XXX_XXX_MSIM for MSIM type system properties. If
caller use the old one, it will be dispatched to new one and get by
default phone id.
Ex. PROPERTY_ICC_OPERATOR_NUMERIC

Bug: 18675498
Change-Id: I008a7390fefbbcd9f6569f059d48eedf1da28de0
2015-01-29 19:02:55 -08:00
Stuart Scott
400a3f6df2 Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
bug:19015551
Change-Id: Ibcad6424695a97bd9ae123010bdf740449d09327
2015-01-14 12:12:02 -08:00
Wink Saville
071743f0cb Rename reg/unreg OnSubscriptionsChangedListener.
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
2015-01-13 08:36:24 -08:00
Wink Saville
a54bf65833 Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
Rename isValidSubId to isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
2014-12-11 13:37:50 -08:00
Wink Saville
98513d7bd4 Update API and documentation for invalid subscriptions id's
Bug: 18668873
Change-Id: I3ee987b77fef856e97ea09898c695147cb87a517
2014-12-08 12:44:16 -08:00
Jeff Sharkey
3256601f5e Offer to "merge" subscribers for data usage.
There are some cases where multiple subscriber identities (IMSI)
should be treated as "merged together" from a data usage
perspective.  This is done by extending the template used for
matching purposes to support multiple subscribers.

Then, when we query historical usage or set network policies, we
normalize the matching template to merge to any other identities
that should be included.  When normalizing, the "lowest" identity
is always used for equality and storage purposes, which allows
identities to come and go over time.

This change also fixes data usage recording for multi-SIM devices
by passing along the concrete subscriber identity for each network
interface.  Also correctly create default policies for multi-SIM
devices.  This change also drops setPolicyDataEnable() until it can
be wired up to the right underlying NetworkAgent.  (This means we
still bring up the network, and then rely on iptables rules to block
traffic when over the limit, instead of proactively disabling the
connection.)

Bug: 18012787
Change-Id: If6acf32009fdfea2b836f5aff8e2f3e5e0248b4a
2014-12-08 08:42:59 -08:00
Wink Saville
47920fac33 Add getSimStateForSubscriber and additional SIM_STATE_XXXX values
Bug: 18364932
Change-Id: I836b751a443635efcfb9987bb3b91f55c4dff9d6
2014-12-02 17:08:14 -08:00
Wink Saville
d09c4cad65 Additional changes to SubscriptionManager API as per API council.
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
2014-11-22 10:08:16 -08:00
Wink Saville
2d1ee98227 Revert "Additional changes to SubscriptionManager API as per API council."
This reverts commit baf21da1e1.

Change-Id: I73cbdfadf07ca3cf20b042781b62aafcc72b17d6
2014-11-20 20:29:51 +00:00
Wink Saville
baf21da1e1 Additional changes to SubscriptionManager API as per API council.
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
2014-11-19 16:03:09 -08:00
Wink Saville
a374c3d03b Update SubscriptionManager API as per API council.
bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
2014-11-11 11:48:04 -08:00
Stuart Scott
ab45ec177a SubInfoRecord provides a tinted icon with the initial embossed.
bug: 17575308
Change-Id: I895975dfe8d1c4db8381ef9322bd72c8fcb3e22c
2014-11-07 23:53:39 +00:00
Sanket Padawe
e1013f964d API changes to add carrier name to subinforecord
API changes required to add carrier name of sim as a member of subinforecord.

Change-Id: I08a7f53dc012967005f7b5abd1fbc08f2947da67
2014-11-07 11:37:29 -08:00
Stuart Scott
95fc99b334 Clean up public API of SubInfoRecord.
bug: 17575308
Change-Id: I047ce11fb7835d500652b7ef340a30c052e96b21
2014-11-03 11:11:56 -08:00
Sanket Padawe
d95198eb36 Remove checks to support new sim color selection.
Remove checks to support new sim color selection in multi-sim settings UI.

Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
2014-10-28 13:06:08 -07:00
Wink Saville
63f03dd94c Change subId to int from long
Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
2014-10-23 21:54:09 -07:00
Wink Saville
8eab2b6bdf Add SM isUsableSubIdValue
Change-Id: Ib1381116545688de52bde111acf827b2e07c5621
2014-09-23 14:20:58 -07:00
Anthony Lee
2222d9bc9e am 12c83b93: Merge "isValidSlotId() and isValidPhoneId() updated to handle negatives." into lmp-dev
* commit '12c83b93b13a7e6d37b385c1270c29d8a959bc78':
  isValidSlotId() and isValidPhoneId() updated to handle negatives.
2014-09-12 07:21:03 +00:00
Anthony Lee
b78890c159 isValidSlotId() and isValidPhoneId() updated to handle negatives.
The old version of the code wanted to just check to make sure
that the slot/phone id is greater than INVALID_SLOT_ID or
INVALID_PHONE_ID that are both currently defined to be -1000. The
changes are made for 2 reasons.  First, INVALID_SLOT_ID and/or
INVALID_PHONE_ID might not always be defined to be a negative value
so there is a big assumption.  Secondly, anything greater than
-1000 allows other negative values to be considered valid ids.

Bug: 17243556
Change-Id: I2bbfcc2cfd2d7c4772dfb9c50af2dc88c0f315e2
2014-09-11 12:37:29 -07:00
Wink Saville
f2090b88b7 Unhide SubscriptionManager and SubInfoRecord
Change-Id: I1e6efb4442f0400d404d725c7db5020a26c00f98
2014-09-09 19:51:45 +00:00
Wink Saville
bc0272754d Change suffix UsingSubId to ForSubscriber.
Bug: 17255752
Change-Id: Ifd522888b5aaae111f642d1e35bd1bb939e539d4
2014-09-09 17:38:19 +00:00
Wink Saville
905bb54108 More cleanup prior to unhiding
Adding comments and rename publci SubInfoRecord instance variables

Change-Id: I25a56d779c63a3f483d7a43c5c123404bf489fa3
2014-09-04 17:10:23 -07:00
Tom Taylor
7a96207e2b Add mcc/mnc to SubInfoRecord
Bug 17157686

Change-Id: I47d19dea73f038a8d748f95dd33452da62ebf26b
2014-09-04 14:05:20 -07:00
Wink Saville
f5bca080a2 Hide SubscriptionManager using individual @hide on fields and methods.
Doing this so the unhide for API Council will just be unhiding a few
fields/methods.

Change-Id: Iebc995c1aebe1f17a6552c28f771be7584bf0acb
2014-09-03 15:41:36 -07:00
Wink Saville
8a38a203a9 Rename getActivatedXxx to getActiveXxx
Change-Id: Iba6d2805a69d3385c93b7ed3c6267b5b8b252a28
2014-09-03 12:22:54 -07:00
Wink Saville
c650e0b12a Prepare to make SubscriptionManager public.
Sync SubscriptionManager and its dependentes between lmp-dev
and lmp-sprout-dev.

In SubscriptionManager and SubscriptionController:
-Rename getActivatedSubInfoList to getActiveSubInfoList.
-Remove context as a parameter
-Cleanup

Change-Id: Ie06ced3e7ff5a3d06b3b47892fed22b4bb8972c7
2014-09-02 22:46:42 -07:00
Wink Saville
eeacf93747 Empty triangle displayed for radio signal but calls & data work
TelephonyRegistry: when default sub id is requested set isLegacyApp to
true so when ACTION_DEFAULT_SUBSCRIPTION_CHANGED is received the
TelephonyRegistry.Record.subId will be updated.

SubInfoRecord: Add SubInfoRecord toString for easier debugging

SubscriptionManager: Add putPHoneIdAndSubIdExtra(intent, phoneId, subId)
as this allows explicit setup of phoneId and subId and does not rely on
a phone's subId being set.

Bug: 15669560
Change-Id: I645ddb35b964b08dcb46f881c9d02b932d128950
2014-06-18 01:07:10 -07:00
Wink Saville
fb40dd4d00 Merge kwd to master
Add initial IMS and MSIM support from klp-wireless-dev-mirror

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
2014-06-13 13:30:57 +00:00