Commit Graph

3361 Commits

Author SHA1 Message Date
Jordan Liu
ca075c3176 Merge "Add slot based ICC channel APIs"
am: e278d2bcdd

Change-Id: Ifaaddfc58ee684393bcabfc214d72746125ed158
2019-03-18 13:38:37 -07:00
Jordan Liu
e278d2bcdd Merge "Add slot based ICC channel APIs" 2019-03-18 18:36:54 +00:00
Sooraj Sasindran
f6b0d994a7 Merge changes from topic "Porting-ONSAPIChanges"
am: 31c7607ee6

Change-Id: Ibca8c0202ff702be57f128b0cc24a8679d0a8083
2019-03-15 12:53:18 -07:00
Sooraj Sasindran
31c7607ee6 Merge changes from topic "Porting-ONSAPIChanges"
* changes:
  Should not turn on validation for data
  Provide network bands in AvailableNetworkInfo
2019-03-15 19:31:55 +00:00
Jordan Liu
118895f571 Add slot based ICC channel APIs
These are SystemApis which require MODIFY_PHONE_STATE, and can be used
to open ICC channels when there is no available subscription, using the
slot index instead of subId.

Bug: 126578014
Test: builds
Change-Id: I3f47a8ac07813ea9e326c7d76123352708bfeea2
Merged-In: I3f47a8ac07813ea9e326c7d76123352708bfeea2
2019-03-14 14:25:25 -07:00
Sooraj Sasindran
3b09d711f9 Should not turn on validation for data
Should not turn on validation for data switch every time.
Provide result as a callback

Test: verified manually
Bug: 126264455
Merged-In: I5df2311d91fdab34563148b4466163696e52faf9
Change-Id: I5df2311d91fdab34563148b4466163696e52faf9
2019-03-13 15:36:11 -07:00
Xiangyu/Malcolm Chen
851ec326d9 Merge "Don't return hidden subscription in getActiveSubIdList"
am: d2cb5a0608

Change-Id: Ie8d0998a15b2fa905ba5073f47badf51afd1154a
2019-03-12 16:12:05 -07:00
Malcolm Chen
9ac7e52a93 Don't return hidden subscription in getActiveSubIdList
Now getActiveSubscriptionInfoList will not return hidden
subscriptions. And getActiveSubIdList should be consistent
with it. In the mean time, internal SubscriptionController
API should have a way to specify if caller wants hidden
subscriptions or not.

Bug: 124690005
Test: manual
Change-Id: I46ccae88167c2988d71a6e07da2937bf9644a1f0
Merged-In: I46ccae88167c2988d71a6e07da2937bf9644a1f0
2019-03-12 14:09:33 -07:00
Daniel Huang
9b82062164 Merge "Modify API return type and add callback."
am: f96cc08066

Change-Id: I8d8ff3efd4666c4548dfe8a142ae0ad3f0b34b2c
2019-03-11 23:16:53 -07:00
Daniel Huang
f96cc08066 Merge "Modify API return type and add callback." 2019-03-12 06:02:04 +00:00
Chen Xu
ab85849ce7 Merge "rename precise carrier id to specific carrier id"
am: 118354f77c

Change-Id: I2ef97c1013e3e77b7ec4ec311eaa437503a758e8
2019-03-11 14:54:34 -07:00
danielwbhuang
a335880efe Modify API return type and add callback.
1. Modify the type from boolean to void for updateAvailableNetworks().
2. Adding callback for updateAvailableNetworks().
3. Define error codes for update available networks results.

Test: build pass
Bug: 124616182
Merged-In: I32fe1407deabe36485227ec75931bec334d85abe
Change-Id: I32fe1407deabe36485227ec75931bec334d85abe
2019-03-11 20:02:16 +08:00
chen xu
2b0139ca18 rename precise carrier id to specific carrier id
Bug: 126727010
Test: atest CtsTelephonyTestCases

Change-Id: I4561ae8c15c429912695e0753b2ab3137a4e1e44
(cherry picked from commit 45f6621391)
Merged-in: I4561ae8c15c429912695e0753b2ab3137a4e1e44
2019-03-10 01:06:33 -08:00
Nazanin Bakhshi
26891a4429 Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE"
am: 016409b3d5

Change-Id: I2ced5079661da96b12c3359b6dc89412b585993a
2019-03-08 10:45:20 -08:00
Nazanin Bakhshi
016409b3d5 Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE" 2019-03-08 18:25:59 +00:00
Xiangyu/Malcolm Chen
7a2dd73329 Merge "Adding callback for setPreferredDataSubscriptionId."
am: 442084c722

Change-Id: Ic66db8504d02a22d8da38159e6d2fcf6decd1878
2019-03-08 06:19:31 -08:00
Xiangyu/Malcolm Chen
442084c722 Merge "Adding callback for setPreferredDataSubscriptionId." 2019-03-07 22:47:31 +00:00
Malcolm Chen
db859e7ece Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE
Redefine a PhoneStateListener event so that it reflects which
subscription is currently being used for Internet data. It could
be default user data subscription or currently active opportunistic
subscription.

Bug: 124260187
Test: unittest
Change-Id: Icb90b5bd93845c29157cafddcd53335728638ec2
Merged-In: Icb90b5bd93845c29157cafddcd53335728638ec2
2019-03-07 19:20:47 +00:00
Malcolm Chen
fd11df2924 Adding callback for setPreferredDataSubscriptionId.
The purpose is to provide a way to return success or failure upon
switching data to CBRS subscription.
The same callback is used for ONS to call internal API. Later it
will also be used by Carrier apps to call TelephonyManager#
setPreferredOpportunisticDataSubscription.

Bug: 122255288
Test: manual

Change-Id: Id3f43e024c902d6785017e7866f9e804a486b04f
Merged-In: Id3f43e024c902d6785017e7866f9e804a486b04f
2019-03-06 14:54:41 -08:00
Andrei-Valentin Onea
20ebeb61a9 Merge "Add @UnsupportedAppUsage annotations"
am: 842e3aa420

Change-Id: Ie3bc96e663223de383be59cb764f139f459c5a67
2019-03-06 09:46:00 -08:00
Andrei-Valentin Onea
28eb381cae Merge "Add @UnsupportedAppUsage annotations"
am: 8cbc2e9ad1

Change-Id: I83a19c3b85546749e360ef979e8e6eeac09e29ea
2019-03-06 09:37:26 -08:00
Andrei-Valentin Onea
842e3aa420 Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 17:19:05 +00:00
Andrei-Valentin Onea
8cbc2e9ad1 Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 17:17:27 +00:00
Nazanin Bakhshi
cc64f34a7b Merge "create getModemEnabled function in PhoneConfigurationManager"
am: 8bf13f06d7

Change-Id: I7aa5f7b4c3d7ff28911ba2abf3bfe5666da09082
2019-03-05 16:27:30 -08:00
Nazanin Bakhshi
5c9e3523f0 create getModemEnabled function in PhoneConfigurationManager
Bug: 124402911
Test: build
Change-Id: I7b22c5b0dbe95a8e5be2e0cbf3199841d275dac7
Merged-In: I7b22c5b0dbe95a8e5be2e0cbf3199841d275dac7
(cherry picked from commit 24183ad67acd9fcf3917bd56484212740578f36c)
2019-03-04 12:06:15 -08:00
Amit Mahajan
c45dc5916a Merge "Adding new APN type for Mission Critical Services."
am: 36791ef41e

Change-Id: I4ae43791c9444f792d69e27b76a5bf57f8dfb4c8
2019-03-04 10:43:30 -08:00
Amit Mahajan
36791ef41e Merge "Adding new APN type for Mission Critical Services." 2019-03-04 18:23:30 +00:00
Mark Chien
2b8bbdf659 Merge "Change return value of getTetherApnRequired() to a boolean."
am: 077a04828d

Change-Id: I493559087fc5bd3ace8db52bf9e6e5cc576e843f
2019-03-02 23:05:19 -08:00
Mark Chien
077a04828d Merge "Change return value of getTetherApnRequired() to a boolean." 2019-03-03 06:53:47 +00:00
Amit Mahajan
fd3ee5783e Adding new APN type for Mission Critical Services.
Test: build
Bug: 124447962
Change-Id: I9f608badd363703394432640dc892a4465660b6d
2019-03-01 16:52:17 -08:00
Brad Ebinger
5e7bfe1147 Merge "Fix ImsMmTelManager API in accordance with the council"
am: ea5bb6cd3b

Change-Id: Iddb4c85b71d8fd17fda049e6137eec7a91f18413
2019-03-01 09:37:40 -08:00
Brad Ebinger
66cee391c3 Fix ImsMmTelManager API in accordance with the council
Bug: 121190195
Test: atest FrameworksTelephonyTests
Merged-In: I5d011e1875c082a4532747e30e8582ff3da4ee93
Change-Id: I5d011e1875c082a4532747e30e8582ff3da4ee93
2019-02-28 11:25:13 -08:00
Andrei Onea
cf1a82953b Add @UnsupportedAppUsage annotations
For packages:
  com.android.internal.app
  com.android.internal.appwidget
  com.android.internal.location
  com.android.internal.os
  com.android.internal.policy
  com.android.internal.statusbar
  com.android.internal.telecom
  com.android.internal.telephony
  com.android.internal.widget

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Merged-In: I6eba34467b2492047e5264684312adfa029eb317
Change-Id: I413c4b6dd12bcf40b69423718ed278cbefe82087
2019-02-28 17:01:29 +00:00
Andrei Onea
5ac62403d4 Add @UnsupportedAppUsage annotations
For packages:
  com.android.ims
  com.android.ims.internal
  com.android.ims.internal.uce.options
  com.android.ims.internal.uce.presence
  com.android.ims.internal.uce.uceservice

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Merged-In: I13583455e85c78cfca5f4d67e4b982b58178104e
Change-Id: I448267cfb48838115b1fa1b88a1d167aab81ce4e
2019-02-28 14:29:13 +00:00
Jordan Liu
f097910b87 Merge "CallAttributes uses the call network type"
am: 0a04598a39

Change-Id: I05c392a2a53c295e1edca2341b2d618d5def0dc9
2019-02-25 23:07:03 -08:00
Jordan Liu
0a04598a39 Merge "CallAttributes uses the call network type" 2019-02-25 21:49:11 +00:00
Xin Li
f90d07b1b3 Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master 2019-02-23 00:39:16 +00:00
Michele Berionne
862821ede5 Merge "Add checks on multisim capabilities." 2019-02-22 01:18:41 +00:00
Xin Li
b455c3a7f3 DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I2f9a524f2ba552de3f62e343075cf0abf400bbae
2019-02-21 16:02:06 -08:00
Jordan Liu
65ed9d9227 CallAttributes uses the call network type
Instead of the ServiceState.getNetworkType(), since the service state
might not match the RAT of the specific call, we use the radio type from
the ImsCall.

Bug: 124785734
Test: manual
Change-Id: I33f84bb415c943d5b766fcd3a4e8257d8f7c1cfe
2019-02-21 15:52:36 -08:00
Michele
c5e6e54a20 Add checks on multisim capabilities.
Rename method isMultisimCarrierRestricted to isMultisimSupported to
indicate extended scope that includes checks on the capabilities of the
hardware to support multi-SIM configuration.

Bug: 123537730
Test: Compilation, test application
Change-Id: I20860c7a25b054b8312c144544726337e09559e2
Merged-In: I20860c7a25b054b8312c144544726337e09559e2
2019-02-21 21:28:08 +00:00
Nathan Harold
a6dda25ac9 Merge "Expose the Radio HAL Version for Test Purposes" 2019-02-20 17:50:41 +00:00
Xiangyu/Malcolm Chen
f2cf09c945 Merge "Adding validate before switch feature." 2019-02-20 05:25:00 +00:00
Malcolm Chen
d78dac0bd1 Adding validate before switch feature.
In CBRS DSDS mode, switching data to CBRS network will require
validation first. Adding a component of CellularNetworkValidator
to trigger the validation and pass the result back to PhoneSwitcher.

Bug: 118348832
Test: manual
Change-Id: I689aa494f031834b5cee76906922ebdafa9c77ed
Merged-In: I689aa494f031834b5cee76906922ebdafa9c77ed
2019-02-20 02:52:14 +00:00
Malcolm Chen
1a1689a32c Move getPhoneCount implementation back to TelephonyManager.
Moving it inside iTelephony creates problems. Some components call
getPhoneCount during initialization while iTelephony service is not
even running, which will cause phone process to crash.

Bug: 123667461
Test: manual
Change-Id: I51199eaf0bd87055c21fe61af50f4c353137d621
Merged-In: I51199eaf0bd87055c21fe61af50f4c353137d621
2019-02-20 00:49:58 +00:00
Nathan Harold
69e0ed19e1 Expose the Radio HAL Version for Test Purposes
To properly check that values are being populated by
devices supporting newer HALs, it is necessary to
avoid enforcement on devices using older HAL versions.
Exposing the HAL version for test purposes allows that.

Bug: 122834594
Test: compilation
Change-Id: Idadc2fc8dd4f7b4765af90d92b62eea3e017a843
2019-02-15 09:56:00 -08:00
Brad Ebinger
ca2abcf735 Merge "SMS: Add a compatible API getRecipientAddress for 3GPP2 SMS" 2019-02-14 23:40:44 +00:00
Hall Liu
a3aae9fe4b Merge "Implement more location checks" 2019-02-13 23:21:43 +00:00
Hall Liu
ee313737e9 Implement more location checks
Make the following modifications to APIs and required permissions.
Move the following APIs from checking coarse permission to fine
permission (except for apps targeting pre-Q):
TelephonyManager.getCellLocation()
(deprecated) TelephonyManager.getNeighboringCellInfo()
TelephonyManager.getAllCellInfo()
TelephonyManager.requestCellInfoUpdate()
PhoneStateListener#onCellLocationChanged
PhoneStateListener#onCellInfoChanged

Start checking for fine permission on the following APIs:
(Note -- these will only be logged, not denied until a future CL)
TelephonyManager.requestNetworkScan()
TelephonyScanManager.requestNetworkScan()
NetworkScanCallback#onResults

Start checking for coarse permission on the following APIs:
(Note -- these will only be logged, not denied until a future CL)
TelephonyManager#getAvailableNetworks
TelephonyManager#getServiceStateForSubscriber and #getServiceState
PhoneStateListener#onServiceStateChanged

Bug: 116258458
Test: manual via testapps
Change-Id: I45326ddacbcf538da50ca544d67eed12cf0c0861
2019-02-13 11:07:37 -08:00
Mengjun Leng
43c7335deb SMS: Add a compatible API getRecipientAddress for 3GPP2 SMS
The method getDisplayOriginatingAddress() return null for submit
pdu of 3GPP, it will cause applicatoin can not get address of sent
message. Thread ID is unable to be created for this invalid message
record.

Add an API getRecipientAddress() for SubmitPdu in SmsMessage.

Bug: 73012819
Change-Id: Ib3e98ad3f115038656db1ea7ff5b05491b28b85d
2019-02-12 19:54:05 -08:00