OSDN Git Service
Malcolm Chen [Tue, 30 Jan 2018 01:09:21 +0000 (17:09 -0800)]
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
Malcolm Chen [Mon, 29 Jan 2018 23:10:46 +0000 (15:10 -0800)]
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
Brad Ebinger [Mon, 5 Feb 2018 19:09:25 +0000 (19:09 +0000)]
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
Hugo Benichi [Sun, 4 Feb 2018 23:18:52 +0000 (23:18 +0000)]
Merge "Update OWNER files for connectivity"
Jack Yu [Sat, 3 Feb 2018 04:40:46 +0000 (04:40 +0000)]
Merge "Added data service configuration support"
Treehugger Robot [Sat, 3 Feb 2018 04:40:06 +0000 (04:40 +0000)]
Merge "Added permission for binding data service"
Stanley Tng [Sat, 3 Feb 2018 01:36:03 +0000 (01:36 +0000)]
Merge "Add function to update LE connection parameters"
Treehugger Robot [Sat, 3 Feb 2018 00:03:57 +0000 (00:03 +0000)]
Merge "Add DENSITY_440"
Treehugger Robot [Fri, 2 Feb 2018 23:50:00 +0000 (23:50 +0000)]
Merge "DO NOT MERGE volume shows when status bar is null"
Treehugger Robot [Fri, 2 Feb 2018 23:13:54 +0000 (23:13 +0000)]
Merge "Enable multiple active Ethernet interfaces"
Treehugger Robot [Fri, 2 Feb 2018 22:09:34 +0000 (22:09 +0000)]
Merge "Add missing return statement in setTempFileRootDirectory"
Jack Yu [Thu, 1 Feb 2018 00:40:33 +0000 (16:40 -0800)]
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
Pengquan Meng [Fri, 2 Feb 2018 21:32:11 +0000 (21:32 +0000)]
Merge "Use IntDef for BCD_EXTENDED_TYPE"
Ruchi Kandoi [Fri, 2 Feb 2018 20:34:23 +0000 (20:34 +0000)]
Merge "Add NFC Transaction Event intent actions and extras"
Hall Liu [Fri, 2 Feb 2018 20:01:12 +0000 (20:01 +0000)]
Merge "Rename MbmsDownloadSession#getDownloadStatus"
Beverly [Thu, 1 Feb 2018 18:24:23 +0000 (13:24 -0500)]
DO NOT MERGE volume shows when status bar is null
Bug:
72627648
Test: VolumeDialogControllerImplTest
Change-Id: Ia766d19190d623aecad8d78ba7cbcd9dfbe01218
Ruchi Kandoi [Fri, 2 Feb 2018 17:14:39 +0000 (09:14 -0800)]
Add NFC Transaction Event intent actions and extras
Bug:
72556384
Bug:
65127791
Test: Test App check for RF Events
Change-Id: I22f5e3d8dc11d518c96a74e54121e072caa6a18d
Ruchi Kandoi [Fri, 2 Feb 2018 16:43:11 +0000 (16:43 +0000)]
Merge "Add ServiceSpecificExceptions for SecureElementService."
Treehugger Robot [Fri, 2 Feb 2018 04:22:34 +0000 (04:22 +0000)]
Merge "Return non-negetive value in getMobileStats method"
Hugo Benichi [Fri, 2 Feb 2018 03:48:55 +0000 (12:48 +0900)]
Update OWNER files for connectivity
Test: no functional change
Change-Id: I25276c769468c37970cb1915660fee29e589008c
Ruchi Kandoi [Fri, 2 Feb 2018 00:15:25 +0000 (16:15 -0800)]
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
Brad Ebinger [Wed, 24 Jan 2018 22:38:05 +0000 (14:38 -0800)]
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
Brad Ebinger [Mon, 22 Jan 2018 21:51:52 +0000 (13:51 -0800)]
Make ImsService API @SystemApi
Marks the ImsService API as @SystemAPI.
Bug:
63987047
Test: Build, Telephony unit tests
Merged-In: I10f8a09950be87cb166b718d1dcc2954fba872cb
Change-Id: I10f8a09950be87cb166b718d1dcc2954fba872cb
Brad Ebinger [Tue, 16 Jan 2018 17:33:47 +0000 (09:33 -0800)]
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
Brad Ebinger [Thu, 11 Jan 2018 18:27:43 +0000 (10:27 -0800)]
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
Stanley Tng [Thu, 4 Jan 2018 23:42:25 +0000 (15:42 -0800)]
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
Hall Liu [Thu, 1 Feb 2018 23:05:22 +0000 (23:05 +0000)]
Merge "Check for location access on TelephonyRegistry"
Jack Yu [Thu, 1 Feb 2018 22:50:53 +0000 (14:50 -0800)]
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
Tyler Gunn [Thu, 1 Feb 2018 22:38:55 +0000 (22:38 +0000)]
Merge "Add call recording tone support."
Jordan Liu [Thu, 1 Feb 2018 22:35:38 +0000 (22:35 +0000)]
Merge "Add carrier config option to show call barring UI in CallSettings"
Hall Liu [Fri, 5 Jan 2018 20:08:51 +0000 (12:08 -0800)]
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
Pengquan Meng [Thu, 1 Feb 2018 21:39:44 +0000 (13:39 -0800)]
Use IntDef for BCD_EXTENDED_TYPE
Bug:
72762748
Test: unit test
Change-Id: I33c26b671f6e824ae100d2d5049402cdbade8237
Hall Liu [Sat, 16 Dec 2017 03:46:43 +0000 (19:46 -0800)]
Rename MbmsDownloadSession#getDownloadStatus
Rename and change signature/behavior to match up with middleware
vendor's expectations
Test: run CTS tests
Change-Id: If18acff5631cfc0473c342e9250973866e960d69
Treehugger Robot [Thu, 1 Feb 2018 21:18:53 +0000 (21:18 +0000)]
Merge "Add CarrierConfig to displaying HD audio indicator for GSM/CDMA calls"
nharold [Thu, 1 Feb 2018 21:03:55 +0000 (21:03 +0000)]
Merge "CellSignalStrength cleanup"
Treehugger Robot [Thu, 1 Feb 2018 20:10:36 +0000 (20:10 +0000)]
Merge "Added support for the new 1.2 data setup/deactivate API"
Brad Ebinger [Thu, 1 Feb 2018 16:38:36 +0000 (16:38 +0000)]
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
David Srbecky [Thu, 1 Feb 2018 15:31:05 +0000 (15:31 +0000)]
Merge "Propagate the "dalvik.vm.minidebuginfo" property to ART run-time."
Jack Yu [Wed, 31 Jan 2018 08:33:20 +0000 (00:33 -0800)]
Added support for the new 1.2 data setup/deactivate API
Added support for the 1.2 IRadio APIs that support IWLAN handover.
Test: Telephony sanity tests
Bug:
64132030
Merged-In: I8c962bb45bc4d42610faa32f0ee36080e8e6cb65
Change-Id: I8c962bb45bc4d42610faa32f0ee36080e8e6cb65
(cherry picked from commit
08063d6c1bb64d2b65fe08bfc04d00f3f0fc856f)
Hall Liu [Thu, 23 Nov 2017 01:38:15 +0000 (17:38 -0800)]
Check for location access on TelephonyRegistry
When sending outbound callbacks on CELL_INFO and CELL_LOCATION, check to
make sure that the user has authorized us and the receiving app to get
information on their location.
Bug:
69637693
Test: manual: telephony testapp
Change-Id: Ib4c8c6a9765f504823016e538dd46768d1032792
Mohamed Abdalkader [Tue, 23 Jan 2018 21:09:00 +0000 (13:09 -0800)]
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
Benedict Wong [Wed, 31 Jan 2018 22:45:26 +0000 (22:45 +0000)]
Merge "Fix minor bugs with tunnel mode implementation"
Mohamed Abdalkader [Tue, 23 Jan 2018 17:56:31 +0000 (09:56 -0800)]
Unhide SMS over IMS APIs
While here add more constants for send sms result.
Test: manual
BUG:
69846044
Merged-In: I66fdcff51dc5ded9f6199d09bb667c89f38b6d59
Change-Id: I66fdcff51dc5ded9f6199d09bb667c89f38b6d59
Nathan Harold [Tue, 30 Jan 2018 03:05:29 +0000 (19:05 -0800)]
CellSignalStrength cleanup
Remove a few duplicated initialization methods
in the CellSignalStrength classes. They were
either not being used or were trivially refactored
in to their respective constructors.
Bug:
72742517
Test: compilation
Change-Id: I7115eace62dc0b6d59ea25deedaf5a0d0f270496
Treehugger Robot [Wed, 31 Jan 2018 20:17:19 +0000 (20:17 +0000)]
Merge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked apps."""
Mohamed Abdalkader [Mon, 22 Jan 2018 23:43:37 +0000 (15:43 -0800)]
Remove internal version of SMS apis
Test: manual
BUG=
69846044
Merged-In: Ie084ea67c460c686bd587e4b36f8c1579517ea7f
Change-Id: Ie084ea67c460c686bd587e4b36f8c1579517ea7f
Mohamed Abdalkader [Sat, 13 Jan 2018 00:37:08 +0000 (16:37 -0800)]
Move Sms API to proper MMTelFeature class
- while here remove unnecessary call to ackSms from
SmsImplBase as this is handled by ImsSmsDispatcher
Test: None, APIs not exercised yet.
BUG=
69846044
Merged-In: Iec4bbd07a67502dbbfb2142a7bc95f51be0cb377
Change-Id: Iec4bbd07a67502dbbfb2142a7bc95f51be0cb377
Mohamed Abdalkader [Fri, 12 Jan 2018 19:52:31 +0000 (11:52 -0800)]
Add unique id for sms APIs to be able to trigger correct smstracker
In old APIs the SmsTracker itself was being passed to the RIL
and onSendComplete the tracker's pending intent was triggered
and then the updated messageRef was used as the id.
Instead of passing the tracker, passing a unique id to be used
for the lifetime of the message.
Doing same thing for receiving flow.
Test: None, APIs not exercised yet.
BUG=
69846044
Merged-In: Id19f854e2c48649db8f2031ee4f49cdac331451c
Change-Id: Id19f854e2c48649db8f2031ee4f49cdac331451c
David Brazdil [Wed, 31 Jan 2018 18:35:00 +0000 (18:35 +0000)]
Merge "Show hidden API warning once per process"
Hans Boehm [Wed, 31 Jan 2018 18:20:05 +0000 (18:20 +0000)]
Merge "Add reachabilityFence, remove ExemptionMechanism.finalize"
Alex Light [Wed, 31 Jan 2018 16:47:29 +0000 (16:47 +0000)]
Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked apps.""
This reverts commit
ff5d60b268dfd848c236b62ae241370a68aae39f.
Reason for revert: Fixed issue breaking go/art-build.
Bug:
72400560
Test: Build
Change-Id: Ie8943068302bec02d149917ccf738c0d935f8fe0
David Brazdil [Wed, 31 Jan 2018 11:24:15 +0000 (11:24 +0000)]
Merge "Revert "Make AndroidRuntime only start the debugger for zygote forked apps.""
David Brazdil [Wed, 31 Jan 2018 07:36:35 +0000 (07:36 +0000)]
Revert "Make AndroidRuntime only start the debugger for zygote forked apps."
This reverts commit
daf17d415c1a99c515ffa75f3ec3bb0fb87627fe.
Reason for revert: Topic broke go/art-build. Reverting as ART Sheriff.
Change-Id: I913dcb82532d448116b0c60d98a91b9b7442d5c9
hansson [Wed, 31 Jan 2018 10:23:11 +0000 (10:23 +0000)]
Merge "Fix "zygote is killed by signal 1""
Yohann Roussel [Wed, 31 Jan 2018 09:57:44 +0000 (09:57 +0000)]
Merge "Add tests about MultiDex corruption recovering"
Treehugger Robot [Wed, 31 Jan 2018 09:04:52 +0000 (09:04 +0000)]
Merge "Used the better hash method provided by Objects"
David Brazdil [Wed, 31 Jan 2018 07:59:17 +0000 (07:59 +0000)]
Show hidden API warning once per process
In order to not spam users with warning toasts, add a boolean flag
that guards the displaying of a warning message about hidden API
usage and is set after the first time a message is shown.
Bug:
64382372
Test: manual
Change-Id: If7ea995ddf4727a15eccf55dad42ef7775b1fc91
Benedict Wong [Wed, 24 Jan 2018 23:31:39 +0000 (15:31 -0800)]
Fix minor bugs with tunnel mode implementation
This change makes sure tunnel mode transforms are properly activated
upon construction, and corrects bugs with how policy selectors were being
generated for tunnel mode policies. Specifically, the source/destination could
not be empty strings, even for cases where an empty selector was desired.
Bug:
72457770
Test: GTS tests run
Change-Id: I9a9f64c34b07883a02a5c996614f958486d214fc
nharold [Wed, 31 Jan 2018 00:23:50 +0000 (00:23 +0000)]
Merge "Remove getIsimChallengeResponse"
Wenting Xiong [Fri, 12 Aug 2016 10:28:37 +0000 (18:28 +0800)]
Add carrier config option to show call barring UI in CallSettings
Some operators require to add Call Barring setting UI to CallSetting,
so add a new CarrierConfig value to customize this.
Bug:
30845125
Test: Manual
Change-Id: I5d80508afd8216f04f443c5a9e0dd83d5247788f
Holly Jiuyu Sun [Tue, 30 Jan 2018 23:05:00 +0000 (23:05 +0000)]
Merge "Only allow LPA to select ISD-R using iccTransmitApduBasicChannel"
Treehugger Robot [Tue, 30 Jan 2018 20:09:00 +0000 (20:09 +0000)]
Merge "Update Docstring for SmsMessage.getOriginatingAddress"
Jack Yu [Tue, 30 Jan 2018 20:02:27 +0000 (12:02 -0800)]
Used the better hash method provided by Objects
Test: Unit tests
Bug:
64132030
Change-Id: Ib0fa616b28df97caf5457fd9069fbd76a80b17cc
Alex Light [Tue, 30 Jan 2018 19:55:28 +0000 (19:55 +0000)]
Merge "Make AndroidRuntime only start the debugger for zygote forked apps."
nharold [Tue, 30 Jan 2018 19:52:36 +0000 (19:52 +0000)]
Merge "Update hashCode in CellSignalStrength classes"
Tyler Gunn [Mon, 29 Jan 2018 22:30:52 +0000 (14:30 -0800)]
Add call recording tone support.
Adding carrier configuration option to specify whether the carrier requires
the incall recording tone be played.
Added phone account extra used in Telephony to communicate this to
Telecom.
Added permission pregrant for Telecom for MODIFY_AUDIO_ROUTING; this is
needed as Telecom listening to the AudioRecordingConfiguration callback
from the audio framework. It needs the permission so that it can be
informed of the package names of recording apps.
Test: Manually enabled for local carrier and confirmed that recording
tone plays to remote party when a recording app is started on the device.
Bug:
64138141
Change-Id: I1ab521b79cbeeb4ff4dcbf83de7c17c539637bdc
Treehugger Robot [Tue, 30 Jan 2018 19:11:36 +0000 (19:11 +0000)]
Merge "Prevent ArrayIndexOutOfBoundsException for some invalid sysui_nav_bar values"
nharold [Tue, 30 Jan 2018 18:39:07 +0000 (18:39 +0000)]
Merge changes from topic "cherry-pick-cell-keepalive"
* changes:
Rework KeepalivePacketData for Compatibility with Cell
Add Constants for NATT Keepalive to RILConstants
Relocate KeepalivePacketData to frameworks/base
Treehugger Robot [Tue, 30 Jan 2018 18:33:27 +0000 (18:33 +0000)]
Merge "Add handover permission, fill in some missing API gaps."
Treehugger Robot [Tue, 30 Jan 2018 16:16:34 +0000 (16:16 +0000)]
Merge "DropboxManager: Add err message if passing an invalid fd to addFile()"
Treehugger Robot [Tue, 30 Jan 2018 14:54:25 +0000 (14:54 +0000)]
Merge changes Ied54c246,I0ea83bc8,Ibd8cb61d
* changes:
Create test-legacy/ for android.test.legacy target
Add android.test.legacy.jar to SDK build
Add android.test.legacy target
David Srbecky [Tue, 30 Jan 2018 14:37:37 +0000 (14:37 +0000)]
Propagate the "dalvik.vm.minidebuginfo" property to ART run-time.
Change-Id: I27e230fe91490defde4cc38ca8cbc3aa0765fed1
yuanhao [Mon, 15 Jan 2018 07:37:02 +0000 (15:37 +0800)]
Fix "zygote is killed by signal 1"
Ignore the signal SIGHUP in Zygote and all its forks.
Bug:
71965619
Test: manual
Change-Id: I7987bb044d97ae21ec27beca6e9aefcbe77197f5
Signed-off-by: yuanhao <yuanhao@xiaomi.com>
Treehugger Robot [Tue, 30 Jan 2018 14:22:00 +0000 (14:22 +0000)]
Merge changes I59bd6ec5,I48864d48,I9b46a4e2,I09a70f3e
* changes:
Build test-runner/tests
Use prebuilt android.test. stubs jars for app builds
Build stubs against SDK and clear local variables
Use prebuilt android.test.base.jar for app builds
Paul Duffin [Tue, 30 Jan 2018 13:01:30 +0000 (13:01 +0000)]
Create test-legacy/ for android.test.legacy target
The android.test.legacy (and legacy-android-test) target depends on
code from both test-base/ and test-runner/ and do not really belong
in either folder.
Having a separate folder will also provide a convenient place for
the artifacts needed to publish android.test.legacy to
maven.google.com.
Bug:
30188076
Test: make checkbuild
Change-Id: Ied54c24694b3167fcf9075a3157e92ec53b8f636
Paul Duffin [Mon, 11 Dec 2017 15:13:08 +0000 (15:13 +0000)]
Build test-runner/tests
Previous change
e254526f0fe5d22681555bd4a00b7ee96fee1dc1 inadvertently
removed the line to include the tests/Android.mk file.
(cherry picked from commit
006b7a2b760b89211b9530804118a8333cee314b)
Bug:
30188076
Test: make checkbuild
Change-Id: I59bd6ec5d317eb6306642974902e4c061e594aa8
Merged-In: Ia0ba14a70d2232d464420265a7a5f9c4dde3661b
Paul Duffin [Fri, 26 Jan 2018 15:10:36 +0000 (15:10 +0000)]
Add android.test.legacy.jar to SDK build
This is needed in order to create a prebuilts version of this JAR that
can be used for unbundled builds.
Bug:
30188076
Test: wait for pi-release build and check
(cherry picked from commit
af06ed42b5316a12b0c37d4296cc86cb112d0021)
Change-Id: I0ea83bc88b6107f4154a9ca02f13b7c8cb367fea
Paul Duffin [Tue, 7 Nov 2017 07:33:11 +0000 (07:33 +0000)]
Use prebuilt android.test. stubs jars for app builds
(cherry picked from commit
e144602d9c94d46b2da11d70f526d747b5e05750)
Bug:
30188076
Test: tapas Launcher3
Change-Id: I48864d48098cfa02e15a6eaf8e4d6b53afc5b56c
Merged-In: If632c39c9d98d89d597d410ebc7973903c9fa91e
Paul Duffin [Fri, 5 Jan 2018 15:11:18 +0000 (15:11 +0000)]
Add android.test.legacy target
Adds a library that builds against the public API and so can be safely
statically included into applications to avoid them having to depend
on the android.test.base and android.test.runner runtime libraries.
(cherry picked from commit
a70f66cb5e40105d4b0ec535f011eea83a38c86a)
Bug:
30188076
Test: make checkbuild
Change-Id: Ibd8cb61d00a65dbcf630672706323e42d82e6ba2
Merged-In: Iae7e3c64392e11035322092ed8e194740ba2d321
Paul Duffin [Fri, 30 Jun 2017 15:02:09 +0000 (16:02 +0100)]
Build stubs against SDK and clear local variables
The stubs need to be built against the current SDK where possible and
not the internal modules.
(cherry picked from commit
d41d847c83c598082a6572f38d0d40f5dee427ef)
Bug:
30188076
Test: delete stub files and remake targets
Change-Id: I9b46a4e2be341fed7e5b33bbf1a80d88c5486ae6
Merged-In: Id724c16e56d1e8fe7f61cfafe7f11ea27e01e659
Paul Duffin [Wed, 6 Dec 2017 12:43:28 +0000 (12:43 +0000)]
Use prebuilt android.test.base.jar for app builds
(cherry picked from commit
1f090a8d66126a936e40f0e872c5fe5b655fa335)
Bug:
30188076
Test: make checkbuild
Change-Id: I09a70f3e79d0935394332870613b96c653af5e85
Merged-In: I1d7e705baf5728e7a034f3bd32746de3a1d3cd78
Treehugger Robot [Tue, 30 Jan 2018 08:11:53 +0000 (08:11 +0000)]
Merge "Add odm sepolicy support to SELinuxMMAC.java"
Treehugger Robot [Tue, 30 Jan 2018 03:22:21 +0000 (03:22 +0000)]
Merge "Remove undefined all-aidl-files-under"
Nathan Harold [Mon, 29 Jan 2018 19:36:03 +0000 (11:36 -0800)]
Update Docstring for SmsMessage.getOriginatingAddress
There was a public request for clarification on the address
format for getOriginatingAddress. I did a little research and
have added the answer to the docstring.
Bug:
64697463
Test: compilation
Merged-In: Icf37af0a5940a6fb7798d7c7cafe7b97683bb689
Change-Id: Icf37af0a5940a6fb7798d7c7cafe7b97683bb689
Nathan Harold [Tue, 30 Jan 2018 01:17:10 +0000 (17:17 -0800)]
Update hashCode in CellSignalStrength classes
The CellSignalStrength hashCode function was using a
fairly ineffective method of hashing. An External
reporter requested that we fix it. This CL moves to
using the Objects.hash() implementation.
Bug:
22479413
Test: compilation
Change-Id: Ic017ba54ef757fd3ec3e5000ac61108dd836bd8a
Dan Willemsen [Tue, 30 Jan 2018 00:39:27 +0000 (16:39 -0800)]
Remove undefined all-aidl-files-under
This is not a defined function, and there are no aidl files under these
directories anyways.
Bug:
72661763
Test: find location/lib -name '*.aidl'
Test: find media/lib -name '*.aidl'
Change-Id: I000d8febd54a50d4c07b910fa374ac8019f696be
Hugo Benichi [Tue, 30 Jan 2018 00:26:31 +0000 (00:26 +0000)]
Merge changes I303d1102,I72c9aa43,If13a5284
* changes:
Fix default network validation overcounting
Prevent crash in NetworkManagementServiceTest#shutdown()
Fix ApfTest
Alex Light [Mon, 29 Jan 2018 22:27:38 +0000 (14:27 -0800)]
Make AndroidRuntime only start the debugger for zygote forked apps.
This got changed unintentionally in commit
fffb273. Restore the
original behavior where JDWP will not be enabled for non-zygote apps.
Bug:
72400560
Test: atest CtsJdwpSecurityHostTestCases
Change-Id: I364a9d8b6e87efc1604741a7e5dd68221ed8e491
Holly Jiuyu Sun [Mon, 29 Jan 2018 23:47:11 +0000 (23:47 +0000)]
Merge "Remove SystemApi annotation from EuiccManager.getOtaStatus()"
Nathan Harold [Mon, 29 Jan 2018 21:30:58 +0000 (13:30 -0800)]
Remove getIsimChallengeResponse
Remove the obsolete getIsimChallengeResponse.
Anybody calling this method should use
getIccSimChallengeResponse instead.
Bug:
27954896
Test: compilation
Change-Id: I636825a448992e06dc11d4cd58dee750c38b2c5e
Jiyong Park [Mon, 8 Jan 2018 05:08:17 +0000 (14:08 +0900)]
Remove SystemApi annotation from EuiccManager.getOtaStatus()
EuiccManager.getOtaStatus() has been annotated as @SystemApi, but its
declaring class EuiccManager has not. Therefore, the method hasn't been
recognized as SystemApi (does not appear in system-current.txt) and no
app is using the method.
This hasn't been harmful, but will soon trigger CTS failures when we do
the exact match for SystemAPIs; a runtime entity annotated as @SystemApi
have to exist in the documented API (e.g. system-current.txt). So
removing this no-op annotation.
Bug:
67891551
Test: m -j checkapi
Change-Id: I570ef5e5c88b6b9162116d3d3a7b17367efa9d7f
Chenbo Feng [Thu, 25 Jan 2018 19:43:52 +0000 (11:43 -0800)]
Return non-negetive value in getMobileStats method
The current implementation of getMobileRxBytes and all the similiar
method adds up the return values for multiple calls to getRxBytes so if
all of them return UNSUPPORTED for any reason, getMobileRxBytes() would
return a value such as -3. This behavior is not compliance with the cts
TrafficStatsTest which always assume getMobileRxBytes to return a
non-negetive value. The method now will check tha stats get from
getRxBytes method and add them up only if the stats is valid.
Bug:
72473294
Test: run cts -m CtsNetTestCases -t android.net.cts.TrafficStatsTest
Change-Id: I656970ebc8f6506cf17c4353ad46c0178bb65cfd
Nathan Harold [Thu, 7 Dec 2017 03:07:32 +0000 (19:07 -0800)]
Rework KeepalivePacketData for Compatibility with Cell
KeepalivePacketData currently mixes multiple concepts: the
list of parameters that are used to generate a keepalive
packet, the keepalive packet itself, and the parameters that
are needed to send a keepalive packet over an ethernet link.
The KeepalivePacketData is now a parcelable that can be used
generically by any NetworkAgent, regardless of how that Agent
fulfills its duty to initiate and maintain a keepalive session.
Bug:
69063212
Test: verified with SL4A, additional tests pending
Merged-In: I23dc4827ae729583356a8ff0f02e39a2ad2b81f5
Change-Id: I23dc4827ae729583356a8ff0f02e39a2ad2b81f5
(cherry picked from commit
26deacfbe7eb1730aea9eeb03fa265af2ce90cad)
Nathan Harold [Tue, 11 Jul 2017 23:25:16 +0000 (16:25 -0700)]
Add Constants for NATT Keepalive to RILConstants
Bug:
38350389
Test: compilation
Merged-In: Ic18a7c947d2c62efe76d656bd683f9ce296f68fd
Change-Id: Ic18a7c947d2c62efe76d656bd683f9ce296f68fd
(cherry picked from commit
974aada04734ced17f3842c817e7e8c3528d0739)
Nathan Harold [Fri, 3 Nov 2017 04:01:46 +0000 (21:01 -0700)]
Relocate KeepalivePacketData to frameworks/base
Due to an issue resolving the boot classpath, the
KeepalivePacketData structure cannot be referenced
by frameworks/opt/telephony while it is in services.
-Move KeepalivePacketData to android.net
-Also, relocate IpUtils without changing the package
name.
Bug:
38350389
Test: compilation
Merged-In: If5fc63e9ad8b9b2d4c2fee47ff4bab2ab190a05a
Change-Id: If5fc63e9ad8b9b2d4c2fee47ff4bab2ab190a05a
(cherry picked from commit
41002e3080461ba6a7aee12c1d12dd13edc8626c)
Pavel Maltsev [Tue, 31 Oct 2017 22:34:16 +0000 (15:34 -0700)]
Enable multiple active Ethernet interfaces
- add Ethernet interface configurations to config.xml; no vendors can
specify network capabilities (in particular they can mark network as
restricted which make sense for embedded applications + static IP
configuration)
- extend EthernetManager to support multiple interfaces, use interface
name as an identificator
- extend IpConfigStore to store IP configuration based on string
identifier (e.g. ethernet name)
Test: runtest -x frameworks/base/services/tests/servicestests/ -c com.android.server.net.IpConfigStoreTest
Change-Id: Ic1e70003f2380ca8edb4469d6b34e27c5e8cf059
Treehugger Robot [Mon, 29 Jan 2018 17:59:23 +0000 (17:59 +0000)]
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT"
Mikael Magnusson [Mon, 29 Jan 2018 16:56:10 +0000 (17:56 +0100)]
Prevent ArrayIndexOutOfBoundsException for some invalid sysui_nav_bar values
A user can change sysui_nav_bar via adb.
If value of sysui_nav_bar doesn't contain two semicolons, split String array
is accessed out of bounds throwing an exception, sending SystemUI
in an exception loop.
Test: manual
Test: adb exec-out settings put secure sysui_nav_bar "home;back"
Change-Id: Ia9d74be36d287085650393476029489c9a359a0f
Treehugger Robot [Mon, 29 Jan 2018 14:55:21 +0000 (14:55 +0000)]
Merge "Fix nav keys being tiny on sw600dp devices"
David Brazdil [Mon, 29 Jan 2018 14:46:06 +0000 (14:46 +0000)]
Merge "Control hidden API toast with a system property"