Commit Graph

427 Commits

Author SHA1 Message Date
Brad Ebinger
3fa3e90c3f Merge "Add ims registration status" 2017-09-08 17:04:31 +00:00
Chen Xu
382ec5fec8 Merge "disable carrier actions on redirection part 2" into oc-mr1-dev am: b6a1c5f06b
am: 4de11ebc0f

Change-Id: I035beeaf3c14f3ed42f15a2ae0036b065b9149f8
2017-09-07 21:29:18 +00:00
Chen Xu
4de11ebc0f Merge "disable carrier actions on redirection part 2" into oc-mr1-dev
am: b6a1c5f06b

Change-Id: Ida67351bac953f7b1bc4eb3d0ebc8a331e55b9a1
2017-09-07 16:40:51 +00:00
fionaxu
b537d740c1 disable carrier actions on redirection part 2
DO NOT MERGE handle the corner case: user on new pixel device update from O-DR to
O-MR when they are in captive portal scenario. In this scenrio,
we enabled captiveportalLoginActivity has the default url handler. this
will be persist and reset on sim absent/sim load/network avail.
On my previous fix, I removed all the signals which means after OTA
we won't reset this part. We should leave the reset signal to ensure
no carrier actions applied. even if something abnormal happens, we can
recover gracefully from reboot.

Bug: 65113738
Test: Manual
Change-Id: I445c7bce01e0bf36214f5f4f6327a0582c774dae
2017-09-06 14:55:35 -07:00
Ping Sun
e0e3cbd304 Add ims registration status
Changes the below to display the "IMS registration status" menu
in Status Info setting.
1. Add a new API "isImsRegistered(int subId)" so that IMS registration
status for specific subscription is acquired.
2. Add a carrier config for the customization.

Test: manual Checked "IMS registration state" in Status Info setting
Bug: 28806101
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
2017-09-06 16:41:17 +00:00
fionaxu
1af24abbb9 Merge "disable carrier actions on redirection by default" into oc-mr1-dev am: 5bed401148
am: bd1a716135

Change-Id: I6e0ef66e1cd96683b37f8eff0a8f6fbd4d2901f7
2017-09-06 04:19:45 +00:00
fionaxu
bd1a716135 Merge "disable carrier actions on redirection by default" into oc-mr1-dev
am: 5bed401148

Change-Id: Ie7fc58959699716fc3bd25dfa67a9f1567452009
2017-09-06 04:11:02 +00:00
TreeHugger Robot
5bed401148 Merge "disable carrier actions on redirection by default" into oc-mr1-dev 2017-09-06 04:01:43 +00:00
fionaxu
204777011d disable carrier actions on redirection by default
1. the assumption of "carrier will redirect users to their captive
portal page when users dont have data plan" might not be true for all
carriers. We have seem issues like carriers random redirect users when
they still have balance left.
2. turn this off by default and turn it on if the carrier is
behaving correctly and agree with it.

Bug: 65113738
Test: Manual
Change-Id: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
2017-09-05 14:15:04 -07:00
Bin Chen
4a5a45be4b Merge "Fix typo in CarrierConfigManager javadoc." am: ea598a4f14 am: 3a443cd347 am: c08cbb31cc
am: 92ae90e85a

Change-Id: I28f3ae85f80084b0a29bf817ee7bdc2b80f95b46
2017-09-01 18:11:53 +00:00
Bin Chen
92ae90e85a Merge "Fix typo in CarrierConfigManager javadoc." am: ea598a4f14 am: 3a443cd347
am: c08cbb31cc

Change-Id: Ifd1728d99c72644854e0161fefa4ac13bcc2bbee
2017-09-01 17:54:56 +00:00
Bin Chen
3a443cd347 Merge "Fix typo in CarrierConfigManager javadoc."
am: ea598a4f14

Change-Id: I663aab8773193681760b6ac0a241fde913e5d585
2017-09-01 17:25:07 +00:00
Bin Chen
503513de9e Fix typo in CarrierConfigManager javadoc.
Change-Id: Ie9d2f7aa705b7895777dcfa27e6826babff64e29
2017-09-01 18:20:20 +08:00
TreeHugger Robot
2026fa3377 Merge "Unhide enable_apps carrier config key." 2017-08-31 18:54:57 +00:00
Junda Liu
4793b28d3f Unhide enable_apps carrier config key.
Bug: 62907095
Test: manual
Change-Id: Ifa16c967dadf7788cd190d5ad152fc642fc267f2
2017-08-29 20:22:44 +00:00
Tyler Gunn
9a961f5705 De-couple data enabled from VT settings.
The existing KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS has the impact
of decoupling whether VT is enabled from whether mobile data is enabled.
Making this TRUE by default.
Adding a new carrier config option to indicate whether VILTE data is metered.
This, coupled with KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS allows
us to ensure that wifi video calls can be made, while still ensuring that
mobile data is not used for VT calls.
A carrier config update needs to be made for the few instances where
KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS was set true to ensure
that KEY_VILTE_DATA_IS_METERED_BOOL is false in that case.

Test: Manual
Bug: 36900451
Change-Id: I037f8930901907b55e4245a655e0480668549185
2017-08-23 11:29:20 -07:00
Amit Mahajan
fd528886c4 Make dun APNs as read-only by default.
Test: Verified tethering manually for T-Mo and AT&T
Bug: 38186417
Change-Id: Iae2beede0e20810cba4d96f897756896adf77b30
2017-08-22 11:08:31 -07:00
pkanwar
becc8696a8 Building IMSI encryption support.
Added additional error checks while returning the key.
Create config parameter:
1. IMSI_KEY_AVAILABILITY_INT.
BUG: 35606429
Test: manual

Change-Id: Iaa5fed3b51719679051626081d82b85a04128896
2017-08-18 09:41:08 -07:00
Jack Yu
0cc9d26dff resolve merge conflicts of d5cb58c693 to stage-aosp-master am: f7149eb698
am: d47339389e

Change-Id: I348cf0e33ad101a84d33c6938ddc580f9fe06a27
2017-08-18 07:23:50 +00:00
Jack Yu
f7149eb698 resolve merge conflicts of d5cb58c693 to stage-aosp-master
Test: I solemnly swear I did not test this conflict resolution.

Merged-In: Ifc35306711dde39eb521dc015da931f4d5f2bf06
Change-Id: I9494087c5a90bccc4326c173bf6395996da357af
2017-08-17 23:20:59 -07:00
Jack Yu
950d217406 Reduced the retry after disconnect delay
Reduced the delay from 20 seconds to 10 seconds. And created
a separate delay configuration for it.

Test: Manual
bug: 63633916
Merged-In: Ifc35306711dde39eb521dc015da931f4d5f2bf06
Change-Id: Ifc35306711dde39eb521dc015da931f4d5f2bf06
(cherry picked from commit 5523dc55d8)
2017-08-17 21:30:30 -07:00
TreeHugger Robot
b70a55a7b5 Merge "Reduced the retry after disconnect delay" into oc-mr1-dev 2017-08-17 18:04:40 +00:00
Jeff Davidson
0ac6e0e22c Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public.
There is a reasonable use case for carrier apps to turn off this key
(b/64544341) so it should be visible to apps in the SDK.

Change-Id: I1a06196d4d4c7d6d06026ef74f3f1159c973f8e3
Test: TreeHugger
Fixes: 64721199
2017-08-16 23:30:36 +00:00
Jack Yu
5523dc55d8 Reduced the retry after disconnect delay
Reduced the delay from 20 seconds to 10 seconds. And created
a separate delay configuration for it.

Test: Manual
bug: 63633916
Change-Id: Ifc35306711dde39eb521dc015da931f4d5f2bf06
2017-08-16 14:26:56 -07:00
pkanwar
68e3de7214 Show notification when VoWiFi is active, and user is out of service for
voice.

Bug: 62618428
Test: manual
Change-Id: Ic630991da3199584dd313a8bf3138b020ecebd5c
2017-08-15 20:57:08 +00:00
Chen Xu
0c2b4d7308 Merge "initial value for data_roaming based on carrier"
am: 973ddd55eb

Change-Id: I374dd9e18f9e3bc5e9fe1ea945923f81df90fa15
2017-08-09 17:42:29 +00:00
Jack Yu
54ccaa0e99 Merge "Moved channels settings from carrier config to resources"
am: 79eddf8c0a

Change-Id: If2c2e6e1d260fae50a15c8a3aa8fba4460884ec1
2017-08-09 07:16:37 +00:00
Chen Xu
973ddd55eb Merge "initial value for data_roaming based on carrier" 2017-08-09 01:19:24 +00:00
fionaxu
715b812e75 initial value for data_roaming based on carrier
1. new carrier config for default data roaming value
to support carrier specific feature: turn on data_roaming by default.

Bug: 36193933
Test: manual test
Change-Id: Ie4f3a0714059e1a7257c84802db475c92c17e1b3
2017-08-08 17:08:46 -07:00
Jack Yu
0fc9492176 Moved channels settings from carrier config to resources
Since CBS channels are more countries specific instead
of carrier specific, moving it to resources makes
more sense.

Test: Manual
bug: 31223529
Merged-In: I251a55ba0b17a96ee545cad68558c1ee2c6a707c
Change-Id: I251a55ba0b17a96ee545cad68558c1ee2c6a707c
2017-08-08 15:34:28 -07:00
fionaxu
aa73a69d3a Merge "app link handling under restricted mobile data" into oc-dr1-dev
am: 93bf6200eb

Change-Id: Ic662de15a4cd95a77f509f1aaa56ea3bf6ae4b35
2017-08-08 09:02:26 +00:00
fionaxu
a40b8b7431 Merge "app link handling under restricted mobile data" into oc-dr1-dev
am: 93bf6200eb

Change-Id: I1a506e9f8dae6fd76c74c3f9d7f93c40ce64a387
2017-08-08 09:02:23 +00:00
TreeHugger Robot
93bf6200eb Merge "app link handling under restricted mobile data" into oc-dr1-dev 2017-08-08 08:57:16 +00:00
fionaxu
d60a9d0e58 app link handling under restricted mobile data
1. new actions to allow default carrier app dynamically enable/disable
app-link filtering
2. new intent to notify registered carrier apps of other default
networks
3. signal-to-actions config to sepcify carrier actions on default
network change
default network available -> disable intent filter for app-link
defaut network lost -> enable intent filter for app-link
4. new carrier actions to allow carrier apps to register/unregister
other network status dynmacially

Bug: 62487488
Test: Manual
Change-Id: Ie9fa9f3f4ca38f9f26a90a3dbf95f7f20a8ad773
2017-08-04 18:13:12 -07:00
TreeHugger Robot
858a27c0b6 Merge "Deprecate KEY_EDITABLE_TETHER_APN_BOOL." into oc-mr1-dev 2017-08-02 18:09:41 +00:00
Jeff Sharkey
b7479988d2 Migrate plans to @SystemApi, evolve permissions.
We're not yet ready to commit to SubscriptionPlan as public API, so
relax to be @SystemApi instead.  Add a new MANAGE_SUBSCRIPTION_PLANS
permission that we require apps to hold, unless they've been
delegated access via a trusted CarrierService.

Since several apps have the ability to provide plans for a single
subId, we now remember the "owner" who set the current plan
information, and we refuse to leak plan information beyond the app
that originally set it.

Relax permissions check to not require READ_PHONE_STATE, since we're
only returning data that an app provided to us earlier.  Also fix
NPE when SubscriptionInfo is missing.

Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Bug: 63997177, 63928277, 64156138, 63903381
Change-Id: If503378ef406dcaec438c9b41e837e0a821a3ef4
2017-07-28 16:59:14 -06:00
Junda Liu
61722586f8 Deprecate KEY_EDITABLE_TETHER_APN_BOOL.
Bug: b/63714717
Test: manual
Change-Id: I943a8a20a63c35017e1e4110f49ba5640d0b8a56
2017-07-25 14:50:49 -07:00
Jeff Sharkey
17bebd2fd7 Expose SubscriptionPlan API.
Clean up SubscriptionPlan, add docs, and expose as public API.

Deprecate older constants in CarrierConfigManager, and point users
towards new API.  (The goal of CarrierConfigManager is to express
key/value pairs that are identical for all users on a particular
carrier, not to configure details that vary between users.)

Since a CarrierService may itself not have access to the plan
details, allow them to "delegate" the capability to configure plans
to another package name.

Factor out new RecurrenceRule class which is used by both
NetworkPolicy and SubscriptionPlan internally.  Polish it to support
arbitrary periods, and continue to test it through NPMST.

Bug: 63391323
Test: bit FrameworksCoreTests:android.util.RecurrenceRuleTest
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Exempt-From-Owner-Approval: Bug 63673347
Change-Id: I93fae4a43e58e9e4c32f8bf345a257dcd607f088
2017-07-20 14:55:57 -06:00
Chen Xu
47208e2cf5 Merge "initial value for data_roaming based on carrier" into oc-dr1-dev
am: 068397a319

Change-Id: I5c65666208e834a5b0ad5280f1670a0d7b31aa31
2017-07-19 03:12:33 +00:00
Chen Xu
068397a319 Merge "initial value for data_roaming based on carrier" into oc-dr1-dev 2017-07-19 03:06:01 +00:00
fionaxu
7834be2a3c initial value for data_roaming based on carrier
1. new carrier config for default data roaming value
to support carrier specific feature: turn on data_roaming by default.

Bug: 36193933
Test: manual test
Change-Id: Ie4f3a0714059e1a7257c84802db475c92c17e1b3
2017-07-18 17:32:52 -07:00
Naveen Kalla
7e15c58085 resolve merge conflicts of b78661052c to oc-dr1-dev-plus-aosp
Bug: 62933474
Test: Build
Change-Id: I5728fd9175cc23ec8ef62c0b645cbb3505fb76e3
Merged-In: If2b62b8148ba23840a4c018341e0fed24b41944b
2017-07-13 20:49:08 -07:00
Naveen Kalla
abd2842ce1 Convert CDMA caller ID codes while roaming on 3GPP networks
Convert CDMA CLIR MMI codes to 3GPP MMI codes when a CDMA
device is roaming on a 3GPP network. Use a Carrier Config
to control this feature.

Bug: 62933474
Test: Simulate Roaming scenario and ensure that the dial
      string is converted as expected.

Change-Id: If2b62b8148ba23840a4c018341e0fed24b41944b
Merged-In: If2b62b8148ba23840a4c018341e0fed24b41944b
2017-07-13 15:08:51 -07:00
Amit Mahajan
d6c82cde94 Merge "Make dun APNs as read-only by default." into oc-dr1-dev
am: 730e4a5651

Change-Id: Iab30ea34531682e9e4212aa8930232121aa530bd
2017-07-07 02:37:34 +00:00
Jeff Sharkey
a2790a13fd Fix the red build.
Change-Id: If035d6939f5a465b4b579b590f8f2b5b532e0951
(cherry picked from commit 29d670cea1)
Merged-In: If035d6939f5a465b4b579b590f8f2b5b532e0951
2017-06-26 18:03:02 +00:00
Pankaj Kanwar
70c1f55927 Merge "Carrier Config changes to support IMSI encryption." am: 1caaa514c9 am: e26191a81c
am: 01741762d8

Change-Id: I385f7ce854a52533251d3777e227aeaf695bb7db
2017-06-26 16:03:06 +00:00
Pankaj Kanwar
01741762d8 Merge "Carrier Config changes to support IMSI encryption." am: 1caaa514c9
am: e26191a81c

Change-Id: I777010e6fea82f237ddf224525739a5687f13a2c
2017-06-26 15:55:46 +00:00
Pankaj Kanwar
e26191a81c Merge "Carrier Config changes to support IMSI encryption."
am: 1caaa514c9

Change-Id: Ia9c4d93e8ababf87a0d6027a4322e73111651844
2017-06-26 15:48:03 +00:00
pkanwar
766f4615e9 Carrier Config changes to support IMSI encryption.
Adding 2 config parameters to CarrierConfigManager:
1. imsi_key_download_url.
2. imsi_key_expiration_days_time.

BUG: 35606429
Test: manual

Change-Id: I191dd0db5fa84a57faea88cb59c2c0b2604064b2
2017-06-25 19:46:52 -07:00
fionaxu
35276a6696 resolve merge conflicts of 187fe9d5cf to oc-dr1-dev-plus-aosp
Change-Id: I2cbfdd9b0fcf024509dbda84678ef067add014f9
2017-06-22 12:20:52 -07:00