Commit Graph

3128 Commits

Author SHA1 Message Date
Chen Xu
1ae9d0bced Merge "using the correct intent extra for subId"
am: 45db25d742

Change-Id: Id5e89366c2851631f2696ae2f239b4917495afc7
2018-10-01 21:42:44 -07:00
chen xu
379e5310b7 using the correct intent extra for subId
Some telephony subscription related intent uses hidden extra
PhoneConstants.SUBSCRIPTION_KEY. We should sent the public extra
SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX instead.

Bug: 116754807
Test: telephony unit test
Change-Id: I842df9b3fa7c0c8efed2db6ac5cd6a8c34ab3ee4
2018-10-01 14:44:19 -07:00
Brad Ebinger
417b7b14bb Merge "Revert isResolvingImsBinding ITelephony interface" 2018-10-01 20:58:56 +00:00
Brad Ebinger
25311cd31c Revert isResolvingImsBinding ITelephony interface
Reverting the only user of this interface.

Bug: 109762920
Bug: 116766786
Test: GTS/Unit tests for ImsService
Merged-In: I9c8cc1c4401590865f33fa13402152287063cecf
Change-Id: Id2e1ac2e4fbbcb7f019e79568f21ee56c94b6c1f
2018-09-28 20:11:53 +00:00
Tyler Gunn
95981b0488 Merge "Cleanup deprecated or removed telephony methods."
am: c4833e862e

Change-Id: I1bad9aed4fb6628f47b5a8704e6d1ee3a54023c2
2018-09-26 15:05:47 -07:00
Tyler Gunn
c4833e862e Merge "Cleanup deprecated or removed telephony methods." 2018-09-26 21:55:36 +00:00
Shuo Qian
a4107d39ad Merge "Make SubscriptionManager.isActiveSubId public"
am: fafc51a088

Change-Id: Ieb279a347a42dadefc2fdb3bbea99d455a69a7cb
2018-09-26 11:35:51 -07:00
Shuo Qian
fafc51a088 Merge "Make SubscriptionManager.isActiveSubId public" 2018-09-26 18:19:52 +00:00
sqian
ec149463cc Make SubscriptionManager.isActiveSubId public
Rename subId to subscriptionId

Bug: 113072551
Test: Treehugger
Change-Id: I6f7e0d06a2ad2367dad04723fea808cad8f9597a
2018-09-24 12:30:10 -07:00
Tyler Gunn
98b1ba015f Cleanup deprecated or removed telephony methods.
Mark previously deprecated TelephonyManager APIs as @remove; some of these
have valid public APIs; for now just calling the public APIs to give more
time for API consumers to transition over to the new methods.

Remove ITelephony AIDL calls for removed methods.

Removed ITelephony light greylist for removed methods; see bug for details.
There are public alternatives for most of the remove AIDL methods; a couple
of the subscription specific ones are not available directly but the
non-subscription specific versions should suffice.

Test: Compile/build/manual
Bug: 115776310
Change-Id: Iff4bf99b34b8e14d5a4dc1d2f4e4926880b6434c
2018-09-24 18:02:44 +00:00
Pengquan Meng
b7c2507ff4 Merge "Update network selection API"
am: 2577e1cf8e

Change-Id: I86a7cb276589a5ae595c014f48770289c18b656a
2018-09-21 14:44:43 -07:00
Pengquan Meng
0cecdf70db Update network selection API
Change the manual network selection api in TelephonyManager to support
the OperatorInfo.

Bug: 115401728
Test: manual test
Merged-In: I43dee55ce117873b699cb98c6eb6d41f5dee24ea
Change-Id: I43dee55ce117873b699cb98c6eb6d41f5dee24ea
2018-09-21 10:08:14 -07:00
Nathan Harold
3e8650c5d1 Merge "Add function to encode PLMNs"
am: f681744863

Change-Id: I948db19cbc57f549b880d42200ea4164f4132490
2018-09-18 13:53:03 -07:00
Treehugger Robot
f681744863 Merge "Add function to encode PLMNs" 2018-09-18 18:58:03 +00:00
Pengquan Meng
624ccc3331 Merge "Add New TelephonyManager APIs"
am: b65aca27af

Change-Id: I18c7c905f742e40331dca61efc9c314e6b08ad32
2018-09-12 19:32:41 -07:00
Pengquan Meng
97c29e04fa Add New TelephonyManager APIs
Bug:111453847
Test: build test
Merged-In: I83a5f4149f92ce495cd066f7158e7ff37a66894f
Change-Id: I83a5f4149f92ce495cd066f7158e7ff37a66894f
2018-09-11 15:07:56 -07:00
Xiangyu/Malcolm Chen
e3d93a25d6 Merge "Add API to listen to opportunistic subscriptions change."
am: 26e686a973

Change-Id: I20ba8865169a857e73b4094ac170f63bf41a66a3
2018-09-11 13:11:24 -07:00
Malcolm Chen
27829e2d17 Add API to listen to opportunistic subscriptions change.
Add a new set of APIs so that caller can listen to
opportunistic subscriptions changes.

Bug: 92796390
Test: build
Change-Id: Iaa741141bf1bd04c4b1618d5bfeac733a0690ed8
Merged-In: Iaa741141bf1bd04c4b1618d5bfeac733a0690ed8
2018-09-10 15:36:08 -07:00
Mathew Inwood
44787b6aa7 Merge "Add @UnsupportedAppUsage annotations"
am: fa4ccace61

Change-Id: Ib61dbedb60054bdf6e21b236f6ad9804465d29c8
2018-08-30 02:47:31 -07:00
Mathew Inwood
fa4ccace61 Merge "Add @UnsupportedAppUsage annotations" 2018-08-30 07:55:39 +00:00
Pengquan Meng
93518497b1 Merge "Add new Telephony API for settings migration"
am: adbe45e0ca

Change-Id: Ie3b4c9529cc4279f0caf462efaca18d06689f629
2018-08-29 18:03:16 -07:00
Pengquan Meng
ad224b637e Add new Telephony API for settings migration
Bug:111453847
Test: build test
Change-Id: Ia4468664453e532e80b8834e53d386fabeb11c41
Merged-In: Ia4468664453e532e80b8834e53d386fabeb11c41
2018-08-29 22:19:15 +00:00
Malcolm Chen
5f47241785 Merge "Add PhoneCapabilityChanged in phone state listener"
am: ec67984561

Change-Id: I7beaaea32a0dd27f8c7a8318914416886f21216e
2018-08-24 16:41:39 -07:00
Malcolm Chen
5ee5c14ecb Add PhoneCapabilityChanged in phone state listener
Add a new hidden event PhoneCapabilityChanged that can be
listned to know phone capability has changed.

Bug: 92796390
Test: build
Change-Id: I12ccde1a1c4257ac50c2cfa73d2d5b58dd7e1518
Merged-In: I12ccde1a1c4257ac50c2cfa73d2d5b58dd7e1518
2018-08-24 15:39:01 -07:00
Mathew Inwood
b4936a336b Add @UnsupportedAppUsage annotations
For packages:
  com.android.internal.telephony

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
Change-Id: Ib9bb9c8ba23a3305c8b72600fa5fd3109b4f6ee1
Merged-In: Ia06d9a50c456201dc7ecb960ff1a1563617777a5
2018-08-23 11:47:41 +01:00
Mathew Inwood
b4a4f7e366 Merge "Code reformatting for upcoming automated code changes."
am: fc38791616

Change-Id: I3e77fc382a76eee6bf95e9cdd7f2f7da20fbdb5a
2018-08-21 03:17:43 -07:00
Mathew Inwood
d0741c56fb Code reformatting for upcoming automated code changes.
Adding annotations to individual members cannot be easily done when there
are several enum values defined on a single line. Put each on a line of its
own.

See go/UnsupportedAppUsage for more context.

Bug: 110868826
Test: m
Change-Id: I807a416e234fa92001920b484bbf3eedbf305c41
2018-08-20 13:09:52 +01:00
Malcolm Chen
edf51aebaf Merge "Add APIs in SubscriptionManager for opportunistic subscriptions"
am: c0a2488df6

Change-Id: Id826b13c39e594110f5813b632f1db4cec6baa4a
2018-08-16 17:35:07 -07:00
Malcolm Chen
0ac24ef349 Add APIs in SubscriptionManager for opportunistic subscriptions
Bug: 92796390
Test: unittest
Change-Id: Id6d9454872e4d12a395cc568f7e2361c5b8c9a33
Merged-In: Id6d9454872e4d12a395cc568f7e2361c5b8c9a33
2018-08-15 17:01:44 -07:00
Mathew Inwood
634676e2f9 Merge "Add @UnsupportedAppUsage annotations" am: f892a8ce9f
am: 7a10fd6a47

Change-Id: I9af4cf36f02d6da12aee1ed8a74b5fe2f2a83a65
2018-08-03 04:21:40 -07:00
Mathew Inwood
7a10fd6a47 Merge "Add @UnsupportedAppUsage annotations"
am: f892a8ce9f

Change-Id: I34b238c2105ea4f46c1cbdbc4b2e4375562398f1
2018-08-03 04:12:24 -07:00
Treehugger Robot
f892a8ce9f Merge "Add @UnsupportedAppUsage annotations" 2018-08-02 15:11:40 +00:00
Nathan Harold
3193926e6a Merge "Pass SdkVersion to getNeighboringCellInfo" am: cec3f1fafb
am: 8f4fdd4e78

Change-Id: I1397d457efe3c1758795aace2f05ed330a92e596
2018-08-01 16:13:48 -07:00
Nathan Harold
8f4fdd4e78 Merge "Pass SdkVersion to getNeighboringCellInfo"
am: cec3f1fafb

Change-Id: I46ede415a660852938506b9bd4eebff409da5929
2018-08-01 15:51:30 -07:00
Mathew Inwood
45321deeef Add @UnsupportedAppUsage annotations
For packages:
  com.android.ims.internal.uce.uceservice
  com.android.ims.internal.uce.presence
  com.android.ims.internal.uce.options
  com.android.ims.internal.uce.common
  com.android.ims.internal
  com.android.ims

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
Change-Id: I9e39973bf43a80f17038f7e239a94ef2209e6e2a
Merged-In: Ib1819d4d15e730c0f224b45fb72f3225b0dddf91
2018-08-01 14:07:13 +01:00
Malcolm Chen
9afe59bf1c Have proper permission check in getConfigForSubId
In CarrierConfigManager, add pass context in constructor, so that
when calling CarrierConfigLoader#getConfigForSubId, it can pass
callingPackage.

Bug: 73136824
Test: regression
Change-Id: I4bbff4ea30e2d5473c14d24d6833bf3ca3c595ec
Merged-In: I4bbff4ea30e2d5473c14d24d6833bf3ca3c595ec
2018-07-31 18:43:01 -07:00
Nathan Harold
3892d05850 Pass SdkVersion to getNeighboringCellInfo
Bug: 62490173
Test: tested manually with SL4A (P and P+ SDK)
Change-Id: I65bae72ab8379f996486e7f4326eddf1b305658a
2018-07-30 17:19:59 -07:00
Malcolm Chen
05ab439039 Have proper permission check in getConfigForSubId
In CarrierConfigManager, add pass context in constructor, so that
when calling CarrierConfigLoader#getConfigForSubId, it can pass
callingPackage.

Bug: 73136824
Test: regression
Change-Id: I4bbff4ea30e2d5473c14d24d6833bf3ca3c595ec
Merged-In: I4bbff4ea30e2d5473c14d24d6833bf3ca3c595ec
2018-07-30 17:08:27 -07:00
Malcolm Chen
6cc64f7244 Have proper permission check in getConfigForSubId
In CarrierConfigManager, add pass context in constructor, so that
when calling CarrierConfigLoader#getConfigForSubId, it can pass
callingPackage.

Bug: 73136824
Test: regression
Change-Id: I4bbff4ea30e2d5473c14d24d6833bf3ca3c595ec
Merged-In: I4bbff4ea30e2d5473c14d24d6833bf3ca3c595ec
2018-07-28 01:41:06 +00:00
Brad Ebinger
8873784d07 Merge "Quick style fixup of ISmsImplBase" am: 6a5c1492d2
am: a36d57b722

Change-Id: I5af8df77455e01d90e3d358afc2d9f39269572ab
2018-07-23 12:04:14 -07:00
Brad Ebinger
a36d57b722 Merge "Quick style fixup of ISmsImplBase"
am: 6a5c1492d2

Change-Id: Idf5c1cbcc4d7ef22a99289bf8aebeedfb301e53a
2018-07-23 10:59:25 -07:00
Brad Ebinger
24edc2bc42 Quick style fixup of ISmsImplBase
Test: Compiles
Change-Id: Ic27db060e402d8a3239fe588a229c246c3228184
2018-07-19 16:17:31 -07:00
Nathan Harold
c8fde9f310 Merge "Re-Number RIL Message IDs to Match RIL.h" am: 8424001a04
am: f448662744

Change-Id: I98eb865f45fd608d4d8f73ce3bc8a9afa26bd2d2
2018-07-13 17:30:59 -07:00
Nathan Harold
f448662744 Merge "Re-Number RIL Message IDs to Match RIL.h"
am: 8424001a04

Change-Id: I5d284e48bbc2c9c461004f521bd719a490b9fed9
2018-07-13 15:45:31 -07:00
Nathan Harold
13e47d018d Re-Number RIL Message IDs to Match RIL.h
-Renumber RIL requests to match the message IDs
 for NATT Keepalive messages.
-Update comments to indicate RIL+HAL and HAL-only
 messages.
-Add new message offsets to explicitly support
 HAL-only messages in the list.

Bug: 110181475
Test: runtest frameworks-telephony
Change-Id: I58544f9291f426b5c195ece81113e15ed423d2df
2018-07-12 13:38:20 -07:00
Nathan Harold
552430a357 Add function to encode PLMNs
Add a function to 3-byte encode PLMN IDs
as specified in 24.008 10.5.1.3, which is
the format used for PLMNs in SIM records.

Bug: 73357413
Test: PlmnActRecordTest
Change-Id: I06c9fed003063746f5f2723efcecfec8c5711211
2018-07-11 19:43:05 -07:00
Jordan Liu
bf4acfb71b Merge "Type Allocation Code & Manufacturer Code" am: ff801e5fd7
am: 50f29d8ecf

Change-Id: Ia5ee66c5f99ddd0700bc971ba895c73594e9a517
2018-07-06 12:15:49 -07:00
Jordan Liu
50f29d8ecf Merge "Type Allocation Code & Manufacturer Code"
am: ff801e5fd7

Change-Id: I95b5fd3d2fb977db3f37dcf23c2125c521c1ccd1
2018-07-06 12:06:39 -07:00
David Kelly
db6a391957 Type Allocation Code & Manufacturer Code
- Addition of getTypeAllocationCode & getManufacturerCode to
android.telephony.TelephonyManager.

- The Type Allocation Code is the first eight characters of the IMEI.
The Type Allocation Code identifies a particular GSM device model.

- The Manufacturer Code is the first eight characters of the MEID.
The Manufacturer Code identifies the manufacturer of a CDMA device.

- The reasoning behind adding getTypeAllocationCode is to be
able to obtain the Type Allocation Code without requiring the
READ_PHONE_STATE permission. Currently in order to obtain the
Type Allocation Code a substring operation must be performed on
getImei which is protected by the READ_PHONE_STATE permission.

- The reasoning behind adding getManufacturerCode is to be
able to obtain the Manufacturer Code without requiring the
READ_PHONE_STATE permission. Currently in order to obtain the
Manufacturer Code a substring operation must be performed on
getMeid which is protected by the READ_PHONE_STATE permission.

- The reasoning that these additional methods do not require the
READ_PHONE_STATE permission is that neither the Type Allocation
Code nor the Manufacturer Code can identify a unique device.
The Type Allocation Code and the Manufacturer Code are analogous
to other device information such as device model or device
screen dimensions.

Test: run cts -m CtsTelephonyTestCases
Bug: 74613795
Change-Id: I5a586b5a362b39aae13357329efb19eb93f0434c
Signed-off-by: David Kelly <dkelly@afilias.info>
2018-07-04 08:23:09 +00:00
Jack Yu
8f76322f75 Merge "Used APN type instead of APN id" am: 2e371c1b5a
am: a916542011

Change-Id: I58bb518a7720e65edd73d93b5775fa4cc40b41db
2018-06-29 18:40:06 -07:00