Commit Graph

6286 Commits

Author SHA1 Message Date
TreeHugger Robot
f087f06ed9 Merge "Document device ID access restriction target SDK behavior" into qt-dev 2019-05-23 18:35:44 +00:00
Amit Mahajan
3aa54b1fff Merge changes from topic "Correct subId in divideMessage()" into qt-dev
* changes:
  Fix the default sub id returned by SmsManager.
  Divide a message text into correctly sized parts
2019-05-23 16:42:19 +00:00
Calvin Pan
261b3b13b0 Merge "Get the resources associated with subid to support MSIM" into qt-dev 2019-05-23 13:15:31 +00:00
Nathan Harold
39444b39ba 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
Change-Id: I4e1767c9dc10acbadec286512752d4bb52059b74
2019-05-21 16:50:00 -07:00
Anil Admal
d566984298 Merge "Update non-framework emergency location request notification" into qt-dev 2019-05-21 20:40:22 +00:00
Amit Mahajan
1c0a7a16c1 Fix the default sub id returned by SmsManager.
SmsManager.getDefaultSmsSubscriptionId() did not handle the case
of no default set with a single SIM present. This CL adds the
handling for that.

Test: manual SMS sanity on single sim and DSDS devices
Bug: 132259056
Change-Id: I72ee7af9f0b2662e1ac26b7d3db60c667d06c471
2019-05-21 13:21:03 -07:00
Taesu Lee
98d41e6917 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
Bug: 132259056
Merged-in: Id2512eb62504b7e789f58b7d9697009d565c4a18
Change-Id: Id2512eb62504b7e789f58b7d9697009d565c4a18
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
(cherry picked from commit 8debeeb126)
2019-05-21 10:32:59 -07:00
Chen Xu
3c385651c4 Merge "do not print phone number which is considered as pii" into qt-dev 2019-05-21 17:28:40 +00:00
TreeHugger Robot
f413c1e833 Merge "Revert "Use the SubId in the TM.getNetworkType if Valid"" into qt-dev 2019-05-21 02:51:28 +00:00
Nathan Harold
af62adcb6c Revert "Use the SubId in the TM.getNetworkType if Valid"
This reverts commit f36fee3cf7.

Reason for revert: 133129040

Bug: 133129040
Merged-In: I9a974018d4155426b1050a4b80b82f4bf4a9d996
Change-Id: Ib6f9a4e461a7e1cfa6c4648bd289a8f92475423e
2019-05-21 02:51:21 +00:00
chen xu
720da9bff0 do not print phone number which is considered as pii
do not print phonenumber in subscriptionInfo

Bug: 133191331
Change-Id: Ibdc4689f41a8dac162b617d6972bb72b3dd86e4e
2019-05-20 18:04:13 -07:00
Anil Admal
61da5f06ad Update non-framework emergency location request notification
- Incorporate notification text feedback in b/116328114 so that
  it translates well in different locales.
- Implement PWG recommendation to always notify user of non-framework
  location requests and not make it configurable. Remove es_notify_int
  configuration parameter.

Bug: 116328114
Bug: 130892418
Test: Manual plus existing tests pass.
Change-Id: Iad972eb1a6fe6c6ed5646edb00c1ea483a077553
2019-05-20 16:33:09 -07:00
Brad Ebinger
1f0eec4faf Merge "Fix parcelling issue for certain fields." into qt-dev 2019-05-20 23:21:54 +00:00
Nathan Harold
f36fee3cf7 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
Merged-In: Ice4f673750ab3b374644750113e5b9b2a4f5ba63
Change-Id: Ice4f673750ab3b374644750113e5b9b2a4f5ba63
(cherry picked from commit 0aca431313)
2019-05-20 18:34:40 +00:00
TreeHugger Robot
a8cf106193 Merge "Add workaround for b/124210145" into qt-dev 2019-05-18 06:16:21 +00:00
Jack Yu
4c11809764 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
Change-Id: Ic10931b7fab998bfebe09d316a2d87886222dae3
2019-05-16 14:46:45 -07:00
Brad Ebinger
7c28e44f40 Fix parcelling issue for certain fields.
Bug: 131614858
Test: atest GtsTelephonyTestCases
Change-Id: I2bac24f3004df3852f8c0031e16de0d73848bc2d
2019-05-16 01:27:44 +00:00
David Brazdil
2959b5c136 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
Change-Id: I025887bf7fbc513da155bfe12919cfea9bd9c5fa
2019-05-15 09:58:50 +00:00
Amit Mahajan
ed4fe03371 Merge "Add NAME_SOURCE_CARRIER for subscription display name." into qt-dev 2019-05-15 06:03:07 +00:00
Xiangyu/Malcolm Chen
8343ad4285 Merge "Adding subscription group owner." into qt-dev 2019-05-14 23:13:19 +00:00
Jack Yu
0d40a9c7f8 Merge "Fixed incorrect metered/unmetered APN in AP-assisted mode" into qt-dev 2019-05-14 21:00:15 +00:00
Amit Mahajan
24e102e0e0 Add NAME_SOURCE_CARRIER for subscription display name.
Test: manual
Bug: 131803649
Change-Id: Ieb7d691fb88866162b287f87d5a2b2d94adac7c3
2019-05-14 10:41:59 -07:00
Jack Yu
7ff7865d7b 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
Change-Id: Id1498fb8627dd7221a5ab7cde72929e6ee25b425
2019-05-13 22:41:49 -07:00
Chen Xu
856fe0fefc Merge "checkCarrierPrivilegesForPackage by subId rather than default" into qt-dev 2019-05-14 01:06:05 +00:00
chen xu
28fe1359ee checkCarrierPrivilegesForPackage by subId rather than default
1. checkCarrierPrivilegesForPackages by subId
2. getPackagesWithCarrierPrivileges by subId
3. new hidden API getPackagesWithCarrierPrivilegesForAllPhones which
returns packages for all subs.

Bug: 132078279
Test: Manual
Change-Id: Ic666218f0c290d1b428530982b689af110f74c69
2019-05-13 16:30:37 -07:00
Jiyong Park
6651eb2142 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
Change-Id: I6760f6e4068239361c495ae7c0de3e25f91d38e1
2019-05-11 12:40:50 +09:00
TreeHugger Robot
5968659e8f Merge changes from topics "role-dialer-dialog", "role-sms-dialog" into qt-dev
* changes:
  Deprecate intent action to the old changing default dialer/SMS dialogs.
  Remove TelecomManager.ACTION_CHANGE_DEFAULT_DIALER for apps targeting Q.
  Remove Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT for apps targeting Q.
2019-05-11 03:01:50 +00:00
Hai Zhang
929085f3c3 Deprecate intent action to the old changing default dialer/SMS dialogs.
Bug: 124452117
Bug: 131204827
Test: presubmit
Change-Id: Iee636cf2dbcf4bdda5fc487d6883591e9463b0af
2019-05-10 17:48:30 -07:00
Malcolm Chen
f81aae0981 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
2019-05-10 16:00:47 -07:00
Anil Admal
3fc1f7aa73 Merge "Make non-framework emergency location notification configurable" into qt-dev 2019-05-10 21:21:36 +00:00
Brad Ebinger
8b2d80c768 Merge changes from topic "sms_trampoline_intent-qt-dev" into qt-dev
* changes:
  Trampoline SMS disambig dialog to Telephony
  No longer show disambig when calling SmsManager#getSubId
2019-05-10 19:42:55 +00:00
Anil Admal
befd483289 Make non-framework emergency location notification configurable
Add carrier config parameter to enable/disable posting notification
in the status bar when device location is provided for non-framework
location requests in user initiated emergency use cases.

Bug: 130892418
Test: Manual verification
Change-Id: Ibd10f68c6804f7a6f72feb4fa7948ff5629bbeeb
2019-05-10 12:30:16 -07:00
Michael Groover
b0401fb609 Document device ID access restriction target SDK behavior
Fixes: 132392748
Test: Build
Change-Id: I9aed95087eb97fe206501a464187347e139eb2c3
2019-05-09 19:36:57 -07:00
Brad Ebinger
360415aa13 Trampoline SMS disambig dialog to Telephony
SmsManager used to display a "select default SMS
subscription" dialog every time SmsManager was used
and no default SMS subscription was set. This change
fixes the following issues:
1_ getSubscriptionId no longer pops up a disambig
dialog.
2) The disambig dialog no longer sets the
default, rather it waits for the response from the
user and performs the operation when it receives
a response.
2a) Dialogs can no longer be created from background
services, so we now have a restriction that if
the disambig dialog is shown via a background service,
we will use phone 0 as default (backwards compat for
apps targeting <Q) or fail (on apps targeting Q+).
3) If there is only one active subscription, use that
to perform the operation on MSIM devices instead of
asking and only displaying the one active subscription.
4) Certain non "user-facing" APIs that are used by
carrier apps no longer will pop up a UI.

Bug: 131713446
Bug: 130853716
Bug: 129141025

Test: run SmsManagerTestApp; atest TelephonyFrameworksTests

Change-Id: I6be1c6d7bf6b6ee614b6a7d0369147e3b1890588
2019-05-10 00:14:23 +00:00
Jordan Liu
4f8ad9cb35 Merge "Update getMergedSubscriberIds to pass subId" into qt-dev 2019-05-09 21:27:58 +00:00
TreeHugger Robot
0bf807f2f8 Merge "Add new carrier config for supporting WPS over IMS" into qt-dev 2019-05-09 18:20:19 +00:00
Brad Ebinger
588c2c0e17 Merge "Use requestType, not service type for interrogation check" into qt-dev 2019-05-09 18:14:04 +00:00
andychou
dcc0dd2efc Add new carrier config for supporting WPS over IMS
Some carriers allow WPS over IMS but carrier not allow.
Add a carrier config and dial WPS call over IMS or CS per config value

Bug: 131917532
Test: Override Carrier Config and test WPS over IMS or CS
Change-Id: Idb698b12ba08086584e1883cc61e31f924ae42cb
2019-05-10 00:33:15 +08:00
chen xu
d5deeb15e9 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
Change-Id: I4b014e00528a1f05e0b5f237229c561f8260e2bd
2019-05-08 18:20:51 +00:00
Brad Ebinger
fa3fc22dbc Use requestType, not service type for interrogation check
Test: atest GtsTelephonyTestCases
Bug: 127258685
Change-Id: I9502c8efe20fc7ce2d2f9e03f3e1b09c28c45de0
2019-05-07 23:45:46 +00:00
Brad Ebinger
fa82dddcf6 No longer show disambig when calling SmsManager#getSubId
SmsManager#getSubId used to show a disambig dialog to
pick a default SMS subscription when
SmsManager#getSubscriptionId was called. Since it was used
internally as well, it would cause many of these dialogs
to pop up over and over again.

Do not display the dialog anymore and instead move the
dialog pop up to the methods that actually require the use
of the dialog, such as sending a text.

Bug: 130853716
Test: Manual, Default SMS app
Change-Id: I71ad38f76750c750b149e4cdcb6fcf99ed89212e
2019-05-07 23:09:50 +00:00
Jordan Liu
26dd1a5f4f Update getMergedSubscriberIds to pass subId
Bug: 131189269
Test: manual
Change-Id: I0d237b646969442b71597e66c9cb491c02a144d3
2019-05-07 17:14:15 +00:00
Shuo Qian
73c5892fc9 Merge "Sorting and merge Emergency number better" into qt-dev 2019-05-06 23:31:08 +00:00
Jordan Liu
c560293e15 Merge "Revert "Update documntation for getCardId"" into qt-dev 2019-05-06 23:14:35 +00:00
Jordan Liu
d8ec08c62b Revert "Update documntation for getCardId"
This reverts commit 67b80596b5.

Reason for revert: b/131868150
Bug: 131423779
Change-Id: I7c373e2949cbb8e98322500ae6a1c866fcbfcba0
2019-05-06 22:04:07 +00:00
Youming Ye
e74b7d2365 Merge "Pass in external packageName" into qt-dev 2019-05-06 20:34:14 +00:00
Ecco Park
aaaadd579a Merge "CarrierConfig: add the wifi configs for Carrier-Wifi Application." into qt-dev 2019-05-06 18:11:22 +00:00
Leland Miller
5df2e3e7ec Merge changes from topic "permissions" into qt-dev
* changes:
  Add calling package parameter to IRcs methods
  Use injected instance of RcsControllerCall
  Create new RcsMessageQueryResultParcelable
  Create new RcsParticipantQueryResultParcelable
  Create new RcsThreadQueryResultParcelable
2019-05-06 16:35:06 +00:00
Ecco Park
5110c41737 CarrierConfig: add the wifi configs for Carrier-Wifi Application.
The new configs for wifi will be used in Carrier Wi-Fi Application to
connect the wifi networks defined by a carrier.

Bug: 129964730
Test: unit test
Change-Id: I4d02a19d25626d7331f139e9e85062b05720ac51
Signed-off-by: Ecco Park <eccopark@google.com>
2019-05-06 07:09:01 -07:00
sqian
a1f21a5c2c 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
2019-05-03 22:27:44 +00:00