Commit Graph

18209 Commits

Author SHA1 Message Date
Treehugger Robot
a3ccb8d854 Merge "Add strings and carrier config needed network service." 2018-02-06 20:57:25 +00:00
Paul Duffin
0aa3b20a66 Add apis needed for android.test.legacy
The long term goal of removing junit and dependent android.test classes
from the android.jar is the removal of the runtime libraries that
provide those classes. A key part of the strategy for migrating APKs off
the runtime libraries is the android.test.legacy library which APKs can
statically include in place of the runtime dependencies without having
to change their source code.

The longer term goal is for all tests to migrate from these classes
altogther and to use the Android Test Support Library instead but that
will require significant changes to the test source code.

In order for it to be safe to statically include android.test.legacy in
an APK it cannot use any internal APIs. This change adds the additional
classes and methods needed to the android.test.mock API library. The
additions are all marked as deprecated to try and avoid developers
from using them in new tests.

It also marks the AccountManager constructor used by MockAccountManager
with the android.annotation.MockApi so that it is included in the mock
stubs libraries against which the android.test.mock.stubs[-system]
libraries build.

Bug: 30188076
Test: make checkbuild

(cherry picked from commit 772b692320)

Merged-In: I85417cc328cab898ab93b9b726648f4232555324
Change-Id: If3b6fc630df93a44e4c07ef769737a2ac3ebf476
2018-02-06 13:38:44 +00:00
Malcolm Chen
789289d731 Add strings and carrier config needed network service.
Add resource overlay and carrier config which will determine
which package / network services will be bound to.

Bug: 64132030
Test: regression tests
Change-Id: I5f515ec16b712e7be25f69e0e079d672227542b0
Merged-In: I5f515ec16b712e7be25f69e0e079d672227542b0
2018-02-05 14:25:22 -08:00
Brad Ebinger
de65acb915 Merge changes from topic "ims_apis"
* changes:
  Modify ImsService API to accomodate compat
  Make ImsService API @SystemApi
  Integrate new MMTel APIs into the framework
  Integrate ImsCallSessionListener API changes
2018-02-05 19:09:25 +00:00
Treehugger Robot
0276f4290f Merge "Added permission for binding data service" 2018-02-03 04:40:06 +00:00
Treehugger Robot
6c40bbdc5e Merge "Add DENSITY_440" 2018-02-03 00:03:57 +00:00
Jack Yu
87b6963740 Added permission for binding data service
This is to make sure only the system can bind the data service.

Test: Manual
Bug: 64132030
Merged-In: Iaf4e4a604396ec37c83516f1d1f163614ef23c3d
Change-Id: Iaf4e4a604396ec37c83516f1d1f163614ef23c3d
2018-02-02 13:52:20 -08:00
Ruchi Kandoi
337e2feada Merge "Add NFC Transaction Event intent actions and extras" 2018-02-02 20:34:23 +00:00
Hall Liu
a07d895f09 Merge "Rename MbmsDownloadSession#getDownloadStatus" 2018-02-02 20:01:12 +00:00
Ruchi Kandoi
a077161382 Add NFC Transaction Event intent actions and extras
Bug: 72556384
Bug: 65127791
Test: Test App check for RF Events
Change-Id: I22f5e3d8dc11d518c96a74e54121e072caa6a18d
2018-02-02 09:19:08 -08:00
Brad Ebinger
19628b43cf Modify ImsService API to accomodate compat
Modifies the ImsService API to accomodate
the ImsService compat layer for older
vender implementations

Bug: 63987047
Test: Manual, Telephony unit tests
Merged-In: Ifb2870414e3d80ef114b3c5fa00c5c5e1aa80b05
Change-Id: Ifb2870414e3d80ef114b3c5fa00c5c5e1aa80b05
2018-02-01 15:45:29 -08:00
Brad Ebinger
0e370b4a02 Make ImsService API @SystemApi
Marks the ImsService API as @SystemAPI.

Bug: 63987047
Test: Build, Telephony unit tests
Merged-In: I10f8a09950be87cb166b718d1dcc2954fba872cb
Change-Id: I10f8a09950be87cb166b718d1dcc2954fba872cb
2018-02-01 15:45:29 -08:00
Hall Liu
92964f60ec Rename MbmsDownloadSession#getDownloadStatus
Rename and change signature/behavior to match up with middleware
vendor's expectations

Test: run CTS tests
Change-Id: If18acff5631cfc0473c342e9250973866e960d69
2018-02-01 13:23:17 -08:00
Brad Ebinger
d6d9ff3c2d Merge changes from topics "ims_sms_sms_ready", "ims_sms_rm_internal_sms", "ims_sms_disp"
* changes:
  Add and trigger onReady API for SMS over IMS.
  Unhide SMS over IMS APIs
  Remove internal version of SMS apis
  Move Sms API to proper MMTelFeature class
  Add unique id for sms APIs to be able to trigger correct smstracker
2018-02-01 16:38:36 +00:00
Mohamed Abdalkader
304f4b5509 Add and trigger onReady API for SMS over IMS.
Test: manual test that normal code path is fine since this code path is
not yet exercisable.
BUG=69846044
Merged-In: Icb15ca4aa6606fba641f6270dca5e0e06fc4466a
Change-Id: Icb15ca4aa6606fba641f6270dca5e0e06fc4466a
2018-01-31 14:55:42 -08:00
Mohamed Abdalkader
904c1eca5f Unhide SMS over IMS APIs
While here add more constants for send sms result.

Test: manual
BUG:69846044
Merged-In: I66fdcff51dc5ded9f6199d09bb667c89f38b6d59
Change-Id: I66fdcff51dc5ded9f6199d09bb667c89f38b6d59
2018-01-31 13:18:45 -08:00
Hans Boehm
9a9e22fad4 Merge "Add reachabilityFence, remove ExemptionMechanism.finalize" 2018-01-31 18:20:05 +00:00
Treehugger Robot
1dfa830bb0 Merge "Add handover permission, fill in some missing API gaps." 2018-01-30 18:33:27 +00:00
Ruchi Kandoi
62c46eac8e Add android.Manifest.permission.NFC_TRANSACTION_EVENT
This permission would gate if an application is eligible to receive
notifications about nfc transactions taking place on the Secure
Elements.

Bug: 72556384
Test: Test dummy notifications on sample app.
Change-Id: I233f7185bbc3a5511f79ae012cc60a081968eb99
2018-01-27 01:48:31 +00:00
Ruchi Kandoi
dcf4c6dc26 Add UID and Service for Secure Element Application
Bug: 64994044
Test: Boot; Check Service loaded.
Merged-In: I2f48ff204acd29b1a9f6819910aba5f8f3762977
Change-Id: I2f48ff204acd29b1a9f6819910aba5f8f3762977
(cherry picked from commit dfaf4bdd1e7e12caf9bb69c8facc38e879861baf)
2018-01-26 11:11:52 -08:00
Tobias Thierer
9f82b6bab5 Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API." 2018-01-26 13:05:06 +00:00
weijuncheng
5185d71470 Add DENSITY_440
Add 440dpi as a supported screen density

Bug: 72424600

Test: run android.dpi.cts.ConfigurationTest#testScreenConfiguration and android.app.cts.ActivityManagerMemoryClassTest#testGetMemoryClass

Change-Id: I0dbf998ae02515a97f0d5668eeedc7098da4cca4
Signed-off-by: weijuncheng <weijuncheng@xiaomi.com>
2018-01-26 13:07:42 +08:00
Xiangyu/Malcolm Chen
ffdbbc533c Merge "Add Voice / Data network specific reg states." 2018-01-26 00:41:27 +00:00
Treehugger Robot
71a9e66d4a Merge "Deprecate android.util.Mutable*." 2018-01-26 00:28:52 +00:00
Tyler Gunn
858bfaf79c Add handover permission, fill in some missing API gaps.
Adding the ACCEPT_HANDOVER runtime permission which an app must have in
order to accept handovers (this is per design).

Adding missing onHandoverComplete method in the android.telecom.Connection
API (per design).

Finishing plumbing for android.telecom.Call#onHandoverComplete API.

Fix issue where the new handover API methods would never get called; the
legacy handover extra was being used in this case when it should not have
been.

Bug: 65415068
Test: Verified using new CTS tests
Change-Id: If1558f6a23911862c02ac5b18fb62d86911ed7e2
Merged-In: If1558f6a23911862c02ac5b18fb62d86911ed7e2
2018-01-25 16:20:03 -08:00
Malcolm Chen
4c01328d90 Add Voice / Data network specific reg states.
In NetworkRegistrationState.java, add hidden inner classes that
stores information specific to voice network registration state
and data network registration state.

Bug: 64132030
Test: build
Change-Id: I746be2a50cfa138acc5b2b40e38ab875ceab6d8d
2018-01-25 10:57:43 -08:00
Ruchi Kandoi
a1f9401a22 Open Mobile API for frameworks/base
This contribution is an implementation of the GlobalPlatform
Open Mobile API for Android with some modifications to
namespaces and packages to make it suitable as a core
Android component.

This contribution is based on
0001-Open-Source-Contribution-of-Smartcard-Service-for-fr.patch
which can be found in
https://portland.source.codeaurora.org/patches/quic/la/PATCH_217881_OpenMobileAPI_20171206.tar.gz

The submitted patch was derived from
https://source.codeaurora.org/quic/la/platform/packages/apps/SmartCardService/commit/?h=LA.BF64.1.2.1&id=06ecea9abb8264049f52c7e31c0bc13330a425d5.

Test: Sample Application; open Channels and transmit APDUs

Change-Id: Iac5206bd84798ca0fcdb504c89e1da5383012a5a
Signed-off-by: Jeremy O'Donoghue <jodonogh@codeaurora.org>
2018-01-25 18:04:17 +00:00
Tobias Thierer
833501d0a0 Track removal of Os.waitpid(..., Int32Ref, ...) from API.
Test: Treehugger
Bug: 70985234

(cherry picked from commit 08005bbe91)

Change-Id: I62229d01c13ac12e8c263e601d46ceb4f7ae7a0e
Merged-In: I62229d01c13ac12e8c263e601d46ceb4f7ae7a0e
2018-01-25 13:54:56 +00:00
Treehugger Robot
7e73c73f89 Merge "Update CellInfo API to accomodate new fields." 2018-01-25 12:50:37 +00:00
Tobias Thierer
9223fd6b6b Deprecate android.util.Mutable*.
Since http://r.android.com/565744 , these classes do not appear
in the signature of any other Android API. There are no plans to
make them part of any future API signatures.

They do not provide useful abstractions because:
 - They lack encapsulation and functionality (value is nonfinal;
   lack of equals/hashCode and toString).
 - It's trivial for apps to implement similar types for their
   internal use.

Only three of these eight classes (Mutable{Int,Long,Boolean}) are
used internally in Android; most of these usages could be written
better with named, more specific classes.

Therefore these classes do not pull their own weight on the API
surface of android.util.

This CL deprecates all eight classes in preparation for removing
them from the Android API surface at some point in the future, and
to allow the unused classes to be removed entirely.

Bug: 71546998
Test: Treehugger

(cherry picked from commit d57219411b)

Change-Id: Ib8736faa86d0ae5eec2c47a294f21adcf21d3dc4
Merged-In: I1cc1eb5ca9c36749bbb9a233d60036f6319bf2d3
2018-01-25 12:29:40 +00:00
Treehugger Robot
185a89caf1 Merge "Add ServiceState APIs for carrier aggregation." 2018-01-25 07:47:55 +00:00
Eric Schwarzenbach
a9d9b021be Update CellInfo API to accomodate new fields.
Adds CellConnectionStatus to top level CellInfo type. Adds cell bandwidth
to the CellIdentityLte.

Bug: 72117223
Test: runtest frameworks-telephony

Change-Id: Id5f3b5a2bd4119c099f5e739d5579974e7adc897
2018-01-25 07:25:04 +00:00
nharold
af3fb3efe4 Merge "Move Keepalive out of IpSecTransform.Builder" 2018-01-25 05:50:33 +00:00
Nathan Harold
c43e89f973 Move Keepalive out of IpSecTransform.Builder
The lifecycle of Keepalive offloading is, unfortunately
different from that of an IpSecTransform. Because starting
a keepalive is fundamentally asynchronous, and isn't valid
until after a transform exists, it will now be a separate
optional procedure that may succeed or fail. It remains
linked with a Transform by the need for a Transform to exist
in order to initiate a Keepalive.

Bug: 38350389
Test: compilation
Change-Id: Ia76fccee41f86d694dff436043293d0c0762c041
2018-01-24 19:32:04 -08:00
Eric Schwarzenbach
09a7773583 Add ServiceState APIs for carrier aggregation.
Adds getDuplexMode, getChannelNumber, and getCellBandwidths to
ServiceState.

Bug: 72117602
Test: runtest
Change-Id: I04be7d0a7d88693ef21b252ecc21aa974c2f89c8
2018-01-25 01:10:29 +00:00
Amit Mahajan
8a4275f09f Update comments for ACTION_CARRIER_CONFIG_CHANGED.
Test: none
Bug: 64131518
Change-Id: I7efbbb393289cc11d529898ea3d7f96b0e89f445
2018-01-24 14:30:38 -08:00
Holly Jiuyu Sun
ec44a402d2 Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" 2018-01-24 21:11:07 +00:00
Jack Yu
d5f1de19f4 Added network service interface
The interface for mobile network service. This is the base class
for vendor or first party data service provider to implement
the network service for cellular or IWLAN network support.

Test: Manual
bug: 64132030
Change-Id: Ia358cbb18fc6d15dcc45c75f14b7c952f899e101
2018-01-24 19:13:45 +00:00
Holly Jiuyu Sun
0ee6dfee1a Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""
This reverts commit 5c9dcc0e72.

Reason for revert: The original failure was not caused by this CL and this CL does not depend on the broken one.

Change-Id: Ia60e21f634d8f307f1cf5a3992cb38de04c5f443
2018-01-24 17:57:39 +00:00
Nicolas Geoffray
1f568c14ac Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" 2018-01-24 10:44:10 +00:00
Nicolas Geoffray
5c9dcc0e72 Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."
AOSP build broken.

Bug: 71914112

This reverts commit 2f87d7b2ee.

Change-Id: I53537a6da7616fe6dbbb79927b32720bbeaf1f69
2018-01-24 09:11:40 +00:00
Holly Jiuyu Sun
8fd5b7e1c3 Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." 2018-01-24 05:08:19 +00:00
Cassie Han
eb9452a08d Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents." 2018-01-24 04:55:32 +00:00
Benedict Wong
d056f32bd9 Merge "Expose applyTunnelModeTransform as a system API" 2018-01-24 01:42:30 +00:00
Xiangyu/Malcolm Chen
afd65d9d1c Merge "Add TransportType in AccessNetworkConstants.java" 2018-01-23 23:39:10 +00:00
Holly Jiuyu Sun
2f87d7b2ee Add getUiccSlots() and switchSlots() in TelephonyManager.
Bug: 71914112
Test: test on phone
Change-Id: Ib7e9e40e5ecda48bdcd1f332dc7d6c422c08d942
2018-01-23 15:26:34 -08:00
Benedict Wong
e0d448f31e Expose applyTunnelModeTransform as a system API
Simple change to expose systemAPI for applyTunnelModeTransform

Bug: 36033193
Test: All CTS, unit tests passing
Change-Id: I2d857c048bc0dc80c3949387f946b1f5adf0527e
2018-01-23 23:25:54 +00:00
Cassie
866f494dc2 Move android.provider.Telephony.SECRET_CODE to Telephony.Intents.
Bug: 69616728
Test: Basic telephony sanity
Change-Id: Ia053f9be082ceb139a284598ee2398a25daa7e08
2018-01-23 15:06:53 -08:00
Treehugger Robot
7d441c9b27 Merge "Combined flags of data service requests into one reason param" 2018-01-23 19:43:25 +00:00
Malcolm Chen
8949cc2d1a Add TransportType in AccessNetworkConstants.java
Bug: 64132030
Test: build
Change-Id: I916a0b889110195d23b2a531308171cf4ea74f0c
2018-01-23 10:20:16 -08:00