Commit Graph

3102 Commits

Author SHA1 Message Date
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
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
Jack Yu
a916542011 Merge "Used APN type instead of APN id"
am: 2e371c1b5a

Change-Id: Ib920746cb39937165aa97f79a9ac4e2fed850572
2018-06-29 18:06:39 -07:00
Jack Yu
bfa6635c30 Used APN type instead of APN id
APN id is similar to ApnSetting.ApnType. We can just use the apn
type. No need to use APN id anymore.

Test: Telephony sanity tests + unit tests
Bug: 77511388
Merged-In: If41845604ea14f36272262da110d682eea0d5451
Change-Id: If41845604ea14f36272262da110d682eea0d5451
(cherry picked from commit f42d06010a)
2018-06-29 14:52:52 -07:00
Brad Ebinger
42bf3bef2b Merge "Telephony: Introduce a base class for ISMS.aidl." am: f03b8e2471
am: 0397b9b65d

Change-Id: Ib946404b724ddfaceae06eb5d6026137052dcb7b
2018-06-27 12:55:04 -07:00
Brad Ebinger
0397b9b65d Merge "Telephony: Introduce a base class for ISMS.aidl."
am: f03b8e2471

Change-Id: I2c155c6bb46baa411f531e411f86efe0e56c20dc
2018-06-27 12:46:39 -07:00
Brad Ebinger
f03b8e2471 Merge "Telephony: Introduce a base class for ISMS.aidl." 2018-06-27 18:24:51 +00:00
Ajay Nambi
0bfe9438b1 Telephony: Introduce a base class for ISMS.aidl.
Add a dummy base class implementation for
AIDL APIs defined. Clients can override the
required APIs.

Bug: 73994017
Change-Id: Ifd14e04ae0467a7b963cd993cfd514660f14fa95
2018-06-26 22:54:03 +00:00
Andrew Sapperstein
d8a7b012a0 Merge "Hide system apps until installed (1/2)" into pi-dev
am: 70a9f39e6a

Change-Id: Ide5ea4b18ca95ee061bf84cb349369b2468504d1
2018-06-26 13:19:57 -07:00
Rhed Jao
c19da78203 Hide system apps until installed (1/2)
Applying this mechanism for system carrier apps to make visibility
reasonable from the user's perspective. In other words, before
hidden system apps have been installed, they wouldn't be listed
via APIs in PackageManager which are used at all apps list and
search in Settings and so on.

Test: atest CarrierAppUtilsTest
Test: atest PackageManagerTest
Test: cts DeviceOwnerTest
Test: gts ManagedProfileProvisioningHostsideTest
Bug: 74068582
Change-Id: I1f23aba589b98351a1871a44a3058b67c416f351
2018-06-26 02:21:10 +00:00
Jack Yu
9fa40bd92d Merge "Removed dead code in DcTracker" am: a0b9309ba2
am: 5ae46260e4

Change-Id: Ib664690a19a00c6739fd0bff87e343742832478e
2018-06-21 20:39:13 -07:00
Jack Yu
5ae46260e4 Merge "Removed dead code in DcTracker"
am: a0b9309ba2

Change-Id: I807835bcc1194f695e5fb30098cc82f50fef5d59
2018-06-21 20:28:45 -07:00
Treehugger Robot
a0b9309ba2 Merge "Removed dead code in DcTracker" 2018-06-22 00:21:43 +00:00
Jack Yu
2de4c6ca12 Removed dead code in DcTracker
This work is part of IWLAN refactoring

Test: Build
Bug: 73659459
Change-Id: I041bdda1e168dde0bf5bff08c8c235986d2d8d7d
2018-06-21 14:56:48 -07:00
Brad Ebinger
a54d5e31e3 Merge "Clean up old Context references in ImsConfig" 2018-06-20 16:43:58 +00:00
Brad Ebinger
0418143f6d Merge "Revert isResolvingImsBinding ITelephony interface" into pi-dev
am: 4cc443ae2e

Change-Id: I9c8cc1c4401590865f33fa13402152287063cecf
2018-06-19 16:13:53 -07:00
Brad Ebinger
5f05f1e405 Revert isResolvingImsBinding ITelephony interface
Reverting the only user of this interface.

Bug: 109762920
Test: GTS/Unit tests for ImsService
Change-Id: Id2e1ac2e4fbbcb7f019e79568f21ee56c94b6c1f
Merged-In: Id2e1ac2e4fbbcb7f019e79568f21ee56c94b6c1f
2018-06-19 19:54:43 +00:00
nharold
df00ad1a4b Merge "Use Uppercase instead of Lowercase for PLMN Decode"
am: e61215cab1

Change-Id: I8c75abbd7574072e9b6c501b5fabf61bf2148592
2018-06-19 11:39:07 -07:00
Nathan Harold
7a061af317 Use Uppercase instead of Lowercase for PLMN Decode
A change to IccUtils converted from using lowercase
to uppercase and broke the PLMN trimming logic.

This resolves bugs where the platform may report
5-digit PLMNs with an invalid trailing 'F' character.

This fixes an issue introduced by aosp/575243, which
impacts the Manual Network Selection menu and
the public API.

Bug: 79561854
Test: compilation
Merged-In: I5ea7867cd9c11fe4454188fd1f30bf58b2911712
Change-Id: I5ea7867cd9c11fe4454188fd1f30bf58b2911712
(cherry picked from commit b70fbc85f7)
2018-06-18 11:50:43 -07:00
Robert Greenwalt
3b9e26fb5a Merge "Use Uppercase instead of Lowercase for PLMN Decode" into pi-dev
am: 2125e5c59e

Change-Id: I850e3f98c9ce4b9221665552b50055bc31f72a04
2018-06-12 16:07:28 -07:00
Robert Greenwalt
2125e5c59e Merge "Use Uppercase instead of Lowercase for PLMN Decode" into pi-dev 2018-06-12 22:26:39 +00:00
Brad Ebinger
669a4497e1 Clean up old Context references in ImsConfig
Bug: 77941698
Test: Manual
Merged-In: I9d9b5ac97c710b1d742fc25730e3e28172ff75e3
Change-Id: Ieb24830ef60d1bc383639777f8e22d0dc994782a
2018-06-11 12:59:30 -07:00
Nathan Harold
b70fbc85f7 Use Uppercase instead of Lowercase for PLMN Decode
A change to IccUtils converted from using lowercase
to uppercase and broke the PLMN trimming logic.

This resolves bugs where the platform may report
5-digit PLMNs with an invalid trailing 'F' character.

This fixes an issue introduced by aosp/575243, which
impacts the Manual Network Selection menu and
the public API.

Bug: 79561854
Test: compilation
Change-Id: I5ea7867cd9c11fe4454188fd1f30bf58b2911712
2018-06-07 16:24:14 -07:00
Andrew Sapperstein
15014a6f4c Merge "Revert "Hide system apps until installed (1/2)"" into pi-dev
am: bae9b1a71c

Change-Id: I75e88cc0905cb90412609f9a14627e6fa7963a27
2018-06-07 09:36:29 -07:00
Brad Ebinger
2388c0cb4c Add GTS test APIs for testing ImsService
Bug: 77141737
Test: Manual
Merged-In: Id60cf07121cf98ab3f0a10af10cf70beb25feb54
Change-Id: Ia41a96b5013bc6a7f534c347db72a14348c1fc5d
2018-06-06 15:28:32 -07:00
Sanry Huang
afef5daaf9 Revert "Hide system apps until installed (1/2)"
This reverts commit 40ede29ed6.

Bug: 74068582
Bug: 80444486
Bug: 80316870
Bug: 109803325
Bug: 109642189
Bug: 109660260
Bug: 109649585
Bug: 109647120
Bug: 109648512
Bug: 109648513
Bug: 109647122
Change-Id: I0e50ceebeaecae89f461f541450e24d9c148527d
2018-06-06 19:42:39 +00:00
sanryhuang
6a2a4a01f8 Merge "Hide system apps until installed (1/2)" into pi-dev
am: 56cc567dfd

Change-Id: I5256f98f1face09fbd95146d8a36335b37b3091f
2018-05-24 13:49:35 -07:00
sanryhuang
40ede29ed6 Hide system apps until installed (1/2)
Applying this mechanism for system carrier apps to make visibility
reasonable from the user's perspective. In other words, before
hidden system apps have been installed, they wouldn't be listed
via APIs in PackageManager which are used at all apps list and
search in Settings and so on.

Test: manual
Test: atest CarrierAppUtilsTest
Test: atest PackageManagerTest
Bug: 74068582
Change-Id: Id3ff138ad529b909d9bbf6719af3a553b909ccbb
2018-05-23 16:29:31 -07:00