343875 Commits

Author SHA1 Message Date
Tobias Thierer
2bbf12aa78 Merge "Pin jarjar targets to java_version 1.8." 2018-02-07 00:16:04 +00:00
Xiangyu/Malcolm Chen
1168c31c4a Merge "Update ServiceState to adapt NetworkService change." 2018-02-06 21:32:31 +00:00
Hall Liu
39393f889a Merge "Revert "Check for location access on TelephonyRegistry"" 2018-02-06 21:15:42 +00:00
Treehugger Robot
a3ccb8d854 Merge "Add strings and carrier config needed network service." 2018-02-06 20:57:25 +00:00
Treehugger Robot
872f386f6b Merge "Add missing copyright messages" 2018-02-06 20:47:51 +00:00
Colin Cross
1b27440abc Add missing copyright messages
Bug: 72993971
Test: m sdkparcelables
Change-Id: I9fa422160c29ce3054748b2b8d1e26541a697a90
2018-02-06 11:10:25 -08:00
Hall Liu
3d30946e8e Revert "Check for location access on TelephonyRegistry"
This reverts commit 8d584f0a91b0709b28ebc64abf0a6063429c8d58.

Reason for revert: b/72967560

Change-Id: I9ca3c4a586e740a7b7d4cc5940ca8d4e4ebf3654
2018-02-06 18:13:36 +00:00
Treehugger Robot
1f14eab551 Merge changes Ie05a1759,If3b6fc63
* changes:
  Modify android.test.runner to use new mock APIs
  Add apis needed for android.test.legacy
2018-02-06 15:02:06 +00:00
Paul Duffin
f55f221805 Merge "Correct inaccurate comments in build files" 2018-02-06 13:39:46 +00:00
Paul Duffin
4ea70a23ea Modify android.test.runner to use new mock APIs
Previous change added some new public APIs to allow the
android.test.runner classes to be built against the public API stubs
rather than the internal classes. This change updates the
android.test.runner classes to use that new API.

This in turn is preparation for building an android.test.legacy library
that can be safely statically included in APKs.

Bug: 30188076
Test: make checkbuild

(cherry picked from commit 20af1df63f77f6b3ab12fd6221f581fe84182091)

Merged-In: I302626abb7e048ef0c3169e9a5209b85f2f87d34
Change-Id: Ie05a17598fcabc1189cacc912c01a25782ebd29c
2018-02-06 13:38:44 +00:00
Paul Duffin
f24612b176 Correct inaccurate comments in build files
Bug: 30188076
Test: make checkbuild
Change-Id: I3881e66a949bfc5fbc34db0a104ef7a6995abe35
2018-02-06 13:38:44 +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 772b6923206a34e97c45bc48e7ad4bebfd3eae29)

Merged-In: I85417cc328cab898ab93b9b726648f4232555324
Change-Id: If3b6fc630df93a44e4c07ef769737a2ac3ebf476
2018-02-06 13:38:44 +00:00
Treehugger Robot
c86b195cd5 Merge "Frameworks: Mark tests" 2018-02-06 06:03:09 +00:00
Stanley Tng
383a7d432f Merge "Add function to change LE Tx Data Length" 2018-02-06 01:02:33 +00:00
Malcolm Chen
0a01c6b2e1 Update ServiceState to adapt NetworkService change.
SST is re-routed to get cellular registration states from
CellularNetworkService. Updating ServiceState to adapt that
change.

Bug: 64132030
Test: unittest
Change-Id: Ifd557ce50a4419ead6125cda29c79d331508448e
Merged-In: Ifd557ce50a4419ead6125cda29c79d331508448e
2018-02-05 14:45:20 -08: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
Tobias Thierer
d65595a94e Pin jarjar targets to java_version 1.8.
This CL pins the following make targets to java_version 1.8,
which is currently the default:
  framework-protos
  repackaged.android.test.base
  repackaged.android.test.mock
  repackaged.android.test.runner

For consistency, their dependencies,
  android.test.base
  android.test.mock
  android.test.runner
which contain .java source files, are also pinned to 1.8.

This is so that the two steps:
 a) update jarjar to support v53 class files
 b) support -target 1.9 in the rest of the toolchain
can be completed in any order, in future CLs. Before this CL,
they would have needed to be completed in order a), b).

Bug: 72703434
Test: EXPERIMENTAL_USE_OPENJDK9=true USE_R8=true make checkbuild docs
      (in a client where CL http://r.android.com/596874 was reverted)

Change-Id: If78067294ae7ab78997aa109b0e08be427bdf0b8
2018-02-05 21:14:24 +00: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
Stanley Tng
918c5241c0 Add function to change LE Tx Data Length
As part of new SL4A tests for LE CoC to measure data throughput, this
commit adds a function to set the LE Tx Data Length parameter to its
maximum.

Test: Ran the new ACTS Tests for LE CoC (BleCocTest and BleCoc2ConnTest)
Bug: 70683224
Change-Id: Iea93f6cb9f4f7cc484f121afa158d7dae18d1ef1
2018-02-04 15:55:39 -08:00
Hugo Benichi
771e229a23 Merge "Update OWNER files for connectivity" 2018-02-04 23:18:52 +00:00
Jack Yu
2e9bdd78f2 Merge "Added data service configuration support" 2018-02-03 04:40:46 +00:00
Treehugger Robot
0276f4290f Merge "Added permission for binding data service" 2018-02-03 04:40:06 +00:00
Stanley Tng
853628db72 Merge "Add function to update LE connection parameters" 2018-02-03 01:36:03 +00:00
Treehugger Robot
6c40bbdc5e Merge "Add DENSITY_440" 2018-02-03 00:03:57 +00:00
Treehugger Robot
b5993cfb8e Merge "DO NOT MERGE volume shows when status bar is null" 2018-02-02 23:50:00 +00:00
Treehugger Robot
0a6c539901 Merge "Enable multiple active Ethernet interfaces" 2018-02-02 23:13:54 +00:00
Treehugger Robot
d281b1a116 Merge "Add missing return statement in setTempFileRootDirectory" 2018-02-02 22:09:34 +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
Pengquan Meng
97246476a7 Merge "Use IntDef for BCD_EXTENDED_TYPE" 2018-02-02 21:32:11 +00: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
Beverly
28e5c86b61 DO NOT MERGE volume shows when status bar is null
Bug: 72627648
Test: VolumeDialogControllerImplTest
Change-Id: Ia766d19190d623aecad8d78ba7cbcd9dfbe01218
2018-02-02 12:38:47 -05: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
Ruchi Kandoi
73e7a1a739 Merge "Add ServiceSpecificExceptions for SecureElementService." 2018-02-02 16:43:11 +00:00
Treehugger Robot
bb1d07e681 Merge "Return non-negetive value in getMobileStats method" 2018-02-02 04:22:34 +00:00
Hugo Benichi
1c8756154a Update OWNER files for connectivity
Test: no functional change
Change-Id: I25276c769468c37970cb1915660fee29e589008c
2018-02-02 12:49:45 +09:00
Ruchi Kandoi
816a053400 Add ServiceSpecificExceptions for SecureElementService.
Open Mobile API expects NoSuchElementException and IOException to be
thrown in certain scenarios. ServiceSpecificExceptions are added to
fulfil that.

Bug: 64994044
Test: Throw fake errors and test with sample app
Change-Id: Iec5a85a5444360616d0857817f71c721f26c53bc
2018-02-01 16:27:37 -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
Brad Ebinger
5b1883b5f1 Integrate new MMTel APIs into the framework
Performs the bulk of the work of:
1) Moving the old MMTel APIs to a hidden
.compat namespace to support older vendor
versions of the code.

2) Replace the compat MMTel APIs with the
new ImsService APIs and integrate them
into existing code.

This is one of two CLs, this CL
integrates the new APIs, the next CL
creates the compat layer in telephony
to translate the .compat APIs to the new
APIs to allow Telephony to work with
older versions of the API.

Before commit, the corresponding vendor
changes will have to be submitted as well.

Bug: 63987047
Test: Telephony Unit tests
Merged-In: Icc9ecfdad000f42399beeac142083e62962c12d3
Change-Id: Icc9ecfdad000f42399beeac142083e62962c12d3
2018-02-01 15:45:29 -08:00
Brad Ebinger
6ed4ee6847 Integrate ImsCallSessionListener API changes
Integrates the ImsCallSessionListener API changes.
This involves:

1) Moving the ImsCallSessionListener to the
android.telephony.ims namespace.
2) Creating a compat layer between the old
IImsCallSessionListener AIDL and the new one
for vendors using the old implementation.
3) Modify ImsCallSession to only use
setListener to set ImsCallSessionListener
(other method was never used in our code).

Test: Telephony Unit Tests, Manual IMS Tests
Bug: 63987047
Merged-In: I4378c0b1d68ff4f5f21815c81af52c03a66f81c5
Change-Id: Id0cc43e9c97abb6f2776d8ad1cf599353b71e4b7
2018-02-01 15:45:28 -08:00
Stanley Tng
6da1ddaa53 Add function to update LE connection parameters
As part of new SL4A tests for LE CoC to measure data throughput
performance, this commit will add a function to enable the CoC Facade
to modify the LE Connection Parameters especially the Connection
Intervals.

Test: Ran the new ACTS Tests for LE CoC
Bug: 70683224
Change-Id: Ie071b09a44d68fe063198a39eb788c434b092442
2018-02-01 15:27:14 -08:00
Hall Liu
871202da2f Merge "Check for location access on TelephonyRegistry" 2018-02-01 23:05:22 +00:00
Jack Yu
fcbda45498 Added data service configuration support
Added the resource overlay and carrier config support for
data service binding package configuration.

Test: Telephony sanity tests
Bug: 64132030
Change-Id: I3d64e6c0a5f86b6a4953eb611ee6828153a8b12d
2018-02-01 14:50:53 -08:00
Tyler Gunn
8d5b08c430 Merge "Add call recording tone support." 2018-02-01 22:38:55 +00:00
Jordan Liu
2aa0cdd1d2 Merge "Add carrier config option to show call barring UI in CallSettings" 2018-02-01 22:35:38 +00:00
Hall Liu
e1af92e44d Add missing return statement in setTempFileRootDirectory
Return without setting the local temp file root if the middleware
reports a failure.

Test: cts
Change-Id: I5e8ea1f7941a7157d88536925f681044d26ef540
2018-02-01 13:48:11 -08:00
Pengquan Meng
0879c904d2 Use IntDef for BCD_EXTENDED_TYPE
Bug:72762748
Test: unit test

Change-Id: I33c26b671f6e824ae100d2d5049402cdbade8237
2018-02-01 13:39:49 -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
Treehugger Robot
0be23629a8 Merge "Add CarrierConfig to displaying HD audio indicator for GSM/CDMA calls" 2018-02-01 21:18:53 +00:00