Commit Graph

9398 Commits

Author SHA1 Message Date
Jiyong Park
ff7b4c700f Merge "Add workaround for b/124210145" into qt-dev
am: a8cf106193

Change-Id: I393606e9962aa494dff32ab64cab35333acdd37a
2019-05-20 03:59:22 -07:00
TreeHugger Robot
a8cf106193 Merge "Add workaround for b/124210145" into qt-dev 2019-05-18 06:16:21 +00:00
Nathan Harold
15a38099e0 Merge "Use the SubId in the TM.getNetworkType if Valid" am: 06445094a9
am: 3c42bbd867

Change-Id: I9c361ba4afc80c70051e3382b7a5e2aab7a9071a
2019-05-17 18:36:26 -07: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
Jack Yu
dd56e5fd7e Merge "Fixed concurrent access network registration info" into qt-dev
am: 24d193cc30

Change-Id: I7280c4dc1e64bcc129ded2d2cbe242369b1e23bd
2019-05-16 17:25:01 -07: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
David Brazdil
6c8ea4ad07 Merge "Change CellSignalStrengthGsm.mTimingAdvance to greylist-max-p" into qt-dev
am: 9196bbb404

Change-Id: I21077be8c420eed552cf041bf10eff537e4ed12f
2019-05-16 10:27:26 -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
David Brazdil
9196bbb404 Merge "Change CellSignalStrengthGsm.mTimingAdvance to greylist-max-p" into qt-dev 2019-05-16 16:24:26 +00: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
Michael Groover
285a12043d Merge "Grant device ID access to app with carrier privlege on any sub ID" into qt-dev
am: 7aac1013b7

Change-Id: I78374a9cf934cc2826f322b95223de817f588a4e
2019-05-15 08:40:52 -07:00
Michael Groover
7aac1013b7 Merge "Grant device ID access to app with carrier privlege on any sub ID" into qt-dev 2019-05-15 15:26:13 +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
6853ba9296 Merge "Add NAME_SOURCE_CARRIER for subscription display name." into qt-dev
am: ed4fe03371

Change-Id: I4d1b660864e44dd05be2aaa6477a5414c89aca6f
2019-05-14 23:14:57 -07:00
Amit Mahajan
ed4fe03371 Merge "Add NAME_SOURCE_CARRIER for subscription display name." into qt-dev 2019-05-15 06:03:07 +00: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
Michael Groover
dd2c16678f Grant device ID access to app with carrier privlege on any sub ID
Fixes: 132173603
Test: atest TelephonyPermissionsTest
Test: cts-tradefed run cts-dev -m CtsTelephony3TestCases
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t \
com.android.cts.devicepolicy.DeviceOwnerTest#testDeviceOwnerCanGetDeviceIdentifiers
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t \
com.android.cts.devicepolicy.ManagedProfileTest#testProfileOwnerCanGetDeviceIdentifiers
Test: cts-tradefed run cts-dev -m CtsTelephonyTestCases -t android.telephony.cts.TelephonyManagerTest

Change-Id: I6a92790389db8ce08118e7f7f45d9309296d2551
2019-05-14 17:08:57 -07:00
Xiangyu/Malcolm Chen
f4ca0c79ff Merge "Adding subscription group owner." into qt-dev
am: 8343ad4285

Change-Id: I75cfc7a35fe2f90548aeb5c263909c1c46a72e11
2019-05-14 16:30:40 -07:00
Xiangyu/Malcolm Chen
8343ad4285 Merge "Adding subscription group owner." into qt-dev 2019-05-14 23:13:19 +00:00
Jack Yu
ee9a92b48c Merge "Fixed incorrect metered/unmetered APN in AP-assisted mode" into qt-dev
am: 0d40a9c7f8

Change-Id: Idad859105ace2ebff0e6bcf4a52a1f672401daed
2019-05-14 14:12:19 -07: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
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
Chen Xu
5811135e2a Merge "checkCarrierPrivilegesForPackage by subId rather than default" into qt-dev
am: 856fe0fefc

Change-Id: Id20ca739786ef1fcaf242dbec3d5a004d19aa9a2
2019-05-13 18:30:01 -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
Jordan Liu
f1aca7cf4e Merge "Update getMergedSubscriberIds to pass subId" 2019-05-13 18:16:18 +00: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
Hai Zhang
d3277fc66c Merge changes from topics "role-dialer-dialog", "role-sms-dialog" into qt-dev
am: 5968659e8f

Change-Id: Icd1bdc4090ba5c6fe2c0794de6dc413853d50173
2019-05-10 20:24:03 -07: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
f7c9f62bb1 Merge "Make non-framework emergency location notification configurable" into qt-dev
am: 3fc1f7aa73

Change-Id: I700896c738ef1fd1b9966b7b5d48326a8a09f2b2
2019-05-10 15:57:09 -07: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
Anil Admal
3fc1f7aa73 Merge "Make non-framework emergency location notification configurable" into qt-dev 2019-05-10 21:21:36 +00:00
Brad Ebinger
42ce8673bb Merge changes from topic "sms_trampoline_intent-qt-dev" into qt-dev
am: 8b2d80c768

Change-Id: Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83
2019-05-10 13:11:08 -07: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
Jordan Liu
e586fdea3f Merge "Update getMergedSubscriberIds to pass subId" into qt-dev
am: 4f8ad9cb35

Change-Id: I0d3885cd7506fbc900c358fec360ae893aa21662
2019-05-09 23:01:30 -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
Thom Hurks
118540582b Merge "Use correct variable for init in GsmAlphabet" am: f84cf464e9
am: 2a0d20e295

Change-Id: Icd1657553f0cbc918a0d85f518e863d83204f650
2019-05-09 16:59:22 -07:00
Thom Hurks
2a0d20e295 Merge "Use correct variable for init in GsmAlphabet"
am: f84cf464e9

Change-Id: I552f20acd1de433abecc1ce32912686a5401322d
2019-05-09 15:14:55 -07:00
Brad Ebinger
be49b65d15 Merge "Use requestType, not service type for interrogation check" 2019-05-09 22:09:06 +00:00