Commit Graph

8055 Commits

Author SHA1 Message Date
Treehugger Robot
8402337237 Merge "Add workaround for b/124210145" 2019-06-11 03:25:45 +00:00
Jack Yu
a726a48fcd Supported data enabled override for different scenarios
Added override rules support for always allowing mms and
internet data during voice call.

Test: Manual + unit tests
Bug: 132113695
Merged-In: I2266d7f428901ccbba6bf538a7c7696e6566b96c
Change-Id: I2266d7f428901ccbba6bf538a7c7696e6566b96c
(cherry picked from commit 0d26d718b3)
2019-06-07 14:47:13 -07:00
Jack Yu
7145807316 Merge "Extend the service configuration for the binding service." 2019-06-06 17:51:54 +00:00
sqian
b46b589fc8 Add "+" in EmergencyNumber API
Bug: 133244926
Test: Treehugger
Change-Id: I09b0127ce929ec51fbb5c387c383e76dcde5f0b5
Merged-In: I09b0127ce929ec51fbb5c387c383e76dcde5f0b5
(cherry picked from commit 82cfdba17a)
2019-06-05 12:12:54 -07:00
chen xu
459e51e5ba skip permission check for TelephonyManager API getMmsUserAgent
Bug: 133637995
Test: Manual test
Change-Id: Ib9f211120c34e9b48c02f990088c32fb307a64f2
(cherry picked from commit 4878165365)
Merged-in: Ib9f211120c34e9b48c02f990088c32fb307a64f2
2019-06-04 18:13:32 +00:00
Chen Xu
cdbb700fa3 Merge "Get the resources associated with subid to support MSIM" 2019-06-04 06:34:16 +00:00
calvinpan
6f51e9624f Get the resources associated with subid to support MSIM
To avoid AP get the incorrect mms_user_agent and mms_user_agent_profile_url
in the MSIM device, so get the resource with subscription.

Bug: 131296413
Test: Build pass
Merged-In: Ib00cfe3640b59db5f971c32741eed999131e67c0
Change-Id: Ib00cfe3640b59db5f971c32741eed999131e67c0
(cherry picked from commit ea6d2b1e1e)
2019-06-03 19:51:21 -07:00
Brad Ebinger
541f01b1bc Merge "Fix parcelling issue for certain fields." 2019-06-03 22:54:35 +00:00
Youming Ye
93931ccb81 Merge "Add carrier config for conference participants data support" 2019-06-03 21:09:49 +00:00
Jack Yu
89ccc66963 Considered network preference when simulating legacy data RAT
Correctly supported the legacy data RAT when both cellular
and IWLAN are in service. In this case only report
RAT as IWLAN when any type of APN is preferred on IWLAN.
Otherwise still use the RAT reported by cellular network
service.

Bug: 133516945
Test: Manual

Merged-In: Ifdddad1d5ee95f4576d5002a1b66caafc172cb58
Change-Id: Ifdddad1d5ee95f4576d5002a1b66caafc172cb58
(cherry picked from commit a74f2d8c34)
2019-06-01 00:13:03 -07:00
Evan Tyra
9bd937a0f6 Catch NPE in getServiceStateForSubscriber
ITelephony can enter a bad state with an incorrect SubId and throw an
NPE as shown in the attached bug. This is not an expected error, so a
bugreport will be triggered on userdebug builds on catch.

Test: Local
Bug: 134067547
2019-06-01 00:02:42 +00:00
Youming Ye
37ca693d78 Add carrier config for conference participants data support
Bug: 132312382
Test: Manual
Change-Id: I88edd5a590f46b961c986ef0bf24585b3c2cf4a1
2019-05-30 14:13:44 -07:00
Jiyong Park
d7d472adad Add workaround for b/124210145
Problem description:
Metalava emits signature of a method under a class, even when the method
is not defined in the class when the method is inherited from a hidden
ancestor and the method is part of the public interface that the class
is expected to implement.

To be specific, inside the api signature, MmbmsDownloadServiceBase has
asBinder() and onTransact(). The methods are not defined in the class
but inherited from the auto-generated hidden class
IMbmsDownloadService.Stub. However, since the methods are also declared
in the public ancestors of the class, e.g., Binder and IInterface,
the methods are force-included in the class. Omitting the methods will
cause problem when building the stub version of the class.

This inclusion of the inherited method is breaking
SystemApiAnnotationTest. That's because the test ensures that a symbol
listed in the API signature file for the System API is actually
annotated with @SystemApi.

Solution:
To workaround the issue, actually implement the auto-generated methods
inside the class and annotate them.

Bug: 124210145
Test: atest CtsSystemApiAnnotationTestCases
Merged-In: I6760f6e4068239361c495ae7c0de3e25f91d38e1
Change-Id: I6760f6e4068239361c495ae7c0de3e25f91d38e1
(cherry picked from commit 6651eb2142)
2019-05-31 01:55:31 +09:00
Treehugger Robot
d47ae01063 Merge "Deprecate getNetworkType" 2019-05-27 21:10:50 +00:00
Treehugger Robot
0c7239996d Merge "Add permissions check for getNetworkType" 2019-05-27 19:04:39 +00:00
Yatai Lin
6ed1ada870 Extend the service configuration for the binding service.
Add resource string and carrier config for class name to
specify data service, network service and qualified
network service.

Bug: 130262388
Test: Adding IWLAN data service, IWLAN network service
and use new configuration to bind the service.

Change-Id: I7ddde5d868d02753344734684b0deb2727bdd67e
2019-05-27 15:18:09 +08:00
Hall Liu
d99ca07884 Merge "Stop silently dropping a NullPointerException" 2019-05-24 18:27:44 +00:00
Nathan Harold
7293d28543 Deprecate getNetworkType
This API is a functional duplicate of getDataNetworkType.

Bug: 132466954
Test: make update-api (docstring-only change)
Change-Id: I3a5ba3d601013bc9c97c6ea1732bfac21fce0dcd
2019-05-22 13:57:42 -07:00
Nathan Harold
744b57e122 Add permissions check for getNetworkType
-Add a function in TelephonyPermissions to check
 READ_PHONE_STATE or return NETWORK_TYPE_UNKNOWN (soft denial).
-Honor the subId in TM or use the default DATA sub when
 returning the network type.

Bug: 132466954
Test: cts - atest TelephonyManagerPermissionTest
Merged-In: I4e1767c9dc10acbadec286512752d4bb52059b74
Change-Id: I4e1767c9dc10acbadec286512752d4bb52059b74
(cherry picked from commit 39444b39ba)
2019-05-22 13:44:24 -07:00
Amit Mahajan
dd4b36a12c Add comments for boolean parameters in translate().
Test: none
Bug: 132259056
Change-Id: Ia57d8a81a980959ea1f79692501edd88a8bab273
2019-05-21 17:32:45 -07:00
Brad Ebinger
59bee56d5f Fix parcelling issue for certain fields.
Bug: 131614858
Test: atest GtsTelephonyTestCases
Merged-In: I5ab4f5f3fa05ffe837f1a5b5bccfb93df4902574
Change-Id: I2bac24f3004df3852f8c0031e16de0d73848bc2d
2019-05-22 00:28:15 +00:00
Treehugger Robot
8f7157ca48 Merge "Divide a message text into correctly sized parts" 2019-05-21 05:25:39 +00:00
Nathan Harold
b846e3c100 Merge "Revert "Use the SubId in the TM.getNetworkType if Valid"" 2019-05-21 02:39:43 +00:00
Nathan Harold
7bc3d98515 Revert "Use the SubId in the TM.getNetworkType if Valid"
This reverts commit 0aca431313.

Reason for revert: 133129040

Change-Id: I9a974018d4155426b1050a4b80b82f4bf4a9d996
2019-05-20 23:21:02 +00:00
Taesu Lee
8debeeb126 Divide a message text into correctly sized parts
Message format info is required in order to divide a message text into
correctly sized parts on a device that supports for both 3GPP and 3GPP2
formats in multi-sim. And fixed to get default SMS subId from SmsManager
in SmsMessage class instead.

Test: Manual

Change-Id: Id2512eb62504b7e789f58b7d9697009d565c4a18
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-05-21 07:55:14 +09:00
Leland Miller
c0c7806ec0 Merge "Add documentation for Conversation table" 2019-05-20 17:02:22 +00:00
Jack Yu
9e02ea4763 Merge "Fixed concurrent access network registration info" 2019-05-18 01:18:28 +00:00
Nathan Harold
06445094a9 Merge "Use the SubId in the TM.getNetworkType if Valid" 2019-05-18 00:25:42 +00:00
David Brazdil
52ad4f8e43 Merge "Change CellSignalStrengthGsm.mTimingAdvance to greylist-max-p" 2019-05-17 12:28:22 +00:00
Nathan Harold
0aca431313 Use the SubId in the TM.getNetworkType if Valid
If the TM instance has a specific subid that was
added using TM.createForSubscriptionId(), honor that
subId in getNetworkType().

Bug: 132466954
Test: compilation + manual
Change-Id: Ice4f673750ab3b374644750113e5b9b2a4f5ba63
2019-05-16 19:39:12 -07:00
Xin Li
3fd6ab8bb8 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." 2019-05-17 00:58:07 +00:00
Gowroji Sunil
37ffaecd0e Add documentation for Conversation table
Test: None, documentation only.
Change-Id: I264c0e090f06914d60f3e08d9ea77a5a47763c1c
2019-05-17 00:03:33 +00:00
Jack Yu
aa77f3a308 Fixed concurrent access network registration info
Fixed by adding synchronization block for every place
accessing network registration info in service state.

Bug: 131883293
Test: Manual
Merged-In: Ic10931b7fab998bfebe09d316a2d87886222dae3
Change-Id: Ic10931b7fab998bfebe09d316a2d87886222dae3
(cherry picked from commit 4c11809764)
2019-05-16 16:35:23 -07:00
David Brazdil
deb96a9174 Change CellSignalStrengthGsm.mTimingAdvance to greylist-max-p
Hidden APIs whose access has been restricted in Q should be assigned
maxTargetSdk=P. Fix a field in CellSignalStrengthGsm which was assigned
maxTargetSdk=O.

Bug: 124354830
Test: check out/soong/hiddenapi/hiddenapi-flags.csv
Merged-In: I025887bf7fbc513da155bfe12919cfea9bd9c5fa
Change-Id: I025887bf7fbc513da155bfe12919cfea9bd9c5fa
(cherry picked from commit 2959b5c136)
2019-05-16 17:32:42 +01:00
Malcolm Chen
0b9b81b36a Adding subscription group owner.
Define owner of a subscription group. Such that when subscriptions are
being added into or removed from a group, as long as callingPackage is
the owner, it can skip carrier permission check on the subscriptions in
the group.

This is necessary when a subscription is being added into a
group that contains inactive subscription, which mean its carrier
privilege can't be verified.

Bug: 131854492
Test: cts, unittest, TelephonyManagerTestApp
Change-Id: If2f5b9c8d71469d9e60f1ca48cab36938cd72c48
Merged-In: If2f5b9c8d71469d9e60f1ca48cab36938cd72c48
2019-05-15 20:08:22 -07:00
TreeHugger Robot
32891b31b2 Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master" into stage-aosp-master 2019-05-15 23:02:14 +00:00
Xin Li
c76d117d2a DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
Bug: 132622481
Change-Id: I7ba1a9999b3a9bac8031dd086fa2632e45404f32
2019-05-15 11:31:45 -07:00
Amit Mahajan
ecdf8c596e Add NAME_SOURCE_CARRIER for subscription display name.
Test: manual
Bug: 131803649
Merged-in: Ieb7d691fb88866162b287f87d5a2b2d94adac7c3
Change-Id: Ieb7d691fb88866162b287f87d5a2b2d94adac7c3
(cherry picked from commit 24e102e0e0)
2019-05-15 09:38:27 -07:00
Jack Yu
a255aeab99 Fixed incorrect metered/unmetered APN in AP-assisted mode
From now all data traffic through IWLAN will be unmetered. Only
data through cellular will be checked for metered/unmetered.

Test: Unit tests
Bug: 132433959
Merged-In: Id1498fb8627dd7221a5ab7cde72929e6ee25b425
Change-Id: Id1498fb8627dd7221a5ab7cde72929e6ee25b425
(cherry picked from commit 7ff7865d7b)
2019-05-14 17:19:16 -07:00
chen xu
2a5483ff77 PhoneStateListener msim improvement
1. Docuemnt the scope of each callback event either apply to specific
subscriptions or not.
2. TelephonyRegistry store separate state e.g, precisecallstate, callAttribute
for each slot to support msim.
3. Add missing subscription match check when notify callbacks.

Bug: 130423985
Bug: 132181378
Test:  atest CtsTelephonyTestCases:PhoneStateListenerTest
Merged-In: I4b014e00528a1f05e0b5f237229c561f8260e2bd
Change-Id: I4b014e00528a1f05e0b5f237229c561f8260e2bd
(cherry picked from commit d5deeb15e9)
2019-05-13 21:38:12 -07:00
Jordan Liu
f1aca7cf4e Merge "Update getMergedSubscriberIds to pass subId" 2019-05-13 18:16:18 +00:00
Jordan Liu
857c4cbf5f Update getMergedSubscriberIds to pass subId
Bug: 131189269
Test: manual
Merged-In: I0d237b646969442b71597e66c9cb491c02a144d3
Change-Id: I0d237b646969442b71597e66c9cb491c02a144d3
(cherry picked from commit 973a60d76ec29e7295237ef8b6670f81917b071b)
2019-05-10 14:39:11 -07:00
Brad Ebinger
be49b65d15 Merge "Use requestType, not service type for interrogation check" 2019-05-09 22:09:06 +00:00
Xin Li
5bc12066ca Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." 2019-05-09 22:05:45 +00:00
Brad Ebinger
ff8f2885d4 Use requestType, not service type for interrogation check
Test: atest GtsTelephonyTestCases
Bug: 127258685
Merged-In: Ib0cf44f58f02125ee0e4dc52e4073cd87d55ce52
Change-Id: I9502c8efe20fc7ce2d2f9e03f3e1b09c28c45de0
2019-05-09 21:16:45 +00:00
Thom Hurks
17a01554c7 Use correct variable for init in GsmAlphabet
When initializing the shift table in GsmAlphabet the correct
variable is now used. An error was logged already if the value
is wrong, so this does not have any logic correctness or
performance impact, just code correctness.
Test: very small refactoring. Tests still pass.

Change-Id: I5329cfa0be63b6a3ebd06414c6247d94ca93f40b
Signed-off-by: Thom Hurks <thomhurks@gmail.com>
2019-05-09 00:01:13 +02:00
Jordan Liu
7ac267a585 Merge "Update getCardId doc with details"
am: a0a72ec485

Change-Id: Ic6c014f7b086fad8b7fa131366839e35ebbd7dd1
2019-05-07 15:00:32 -07:00
Jordan Liu
a0a72ec485 Merge "Update getCardId doc with details" 2019-05-07 21:26:02 +00:00
Shuo Qian
22f7e515c5 Merge "Sorting and merge Emergency number better"
am: 70ed8dba68

Change-Id: Ic04771d79d96affb99876fe92a9768937ea93885
2019-05-07 11:18:12 -07:00
sqian
a686f723a8 Sorting and merge Emergency number better
Apply more parameters to sort Emergency number list, it is important
to keep two lists Collection-equal to each other if they have the same
contents. Otherwise, it will introduce more unnecessary updates in
 EmergencyNumberTracker and it may confuse users.

Test: atest EmergencyNumberTest
Bug: 131922424
Change-Id: I64a43886d4000b261ea703b081e6278b0307805f
Merged-In: I64a43886d4000b261ea703b081e6278b0307805f
(cherry picked from commit a1f21a5c2c)
2019-05-07 09:21:26 -07:00