OSDN Git Service
Paul Duffin [Tue, 6 Feb 2018 15:42:31 +0000 (15:42 +0000)]
Merge changes Ie05a1759,If3b6fc63 am:
1f14eab551
am:
73771adf83
Change-Id: Iadca3cac054e707d193a7d054d091a13c78e0cbe
Paul Duffin [Tue, 6 Feb 2018 15:34:34 +0000 (15:34 +0000)]
Merge "Correct inaccurate comments in build files" am:
f55f221805
am:
654f09c3dd
Change-Id: I7bb06fe6c2ecc81d7997c2efee8bfb029b61e994
Paul Duffin [Tue, 6 Feb 2018 15:32:52 +0000 (15:32 +0000)]
Merge changes Ie05a1759,If3b6fc63
am:
1f14eab551
Change-Id: I259f07c37e2797f07b9bfdc13f5ebc0d05429877
Paul Duffin [Tue, 6 Feb 2018 15:25:51 +0000 (15:25 +0000)]
Merge "Correct inaccurate comments in build files"
am:
f55f221805
Change-Id: Iba1b710e00843d8c35c346d64d33250ce6654956
Treehugger Robot [Tue, 6 Feb 2018 15:02:06 +0000 (15:02 +0000)]
Merge changes Ie05a1759,If3b6fc63
* changes:
Modify android.test.runner to use new mock APIs
Add apis needed for android.test.legacy
Paul Duffin [Tue, 6 Feb 2018 13:39:46 +0000 (13:39 +0000)]
Merge "Correct inaccurate comments in build files"
Paul Duffin [Fri, 5 Jan 2018 13:52:17 +0000 (13:52 +0000)]
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
Paul Duffin [Wed, 31 Jan 2018 13:30:22 +0000 (13:30 +0000)]
Correct inaccurate comments in build files
Bug:
30188076
Test: make checkbuild
Change-Id: I3881e66a949bfc5fbc34db0a104ef7a6995abe35
Paul Duffin [Fri, 22 Dec 2017 16:13:15 +0000 (16:13 +0000)]
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
Andreas Gampe [Tue, 6 Feb 2018 09:14:05 +0000 (09:14 +0000)]
Merge "Frameworks: Mark tests" am:
c86b195cd5
am:
2b12970061
Change-Id: I73c717b99b9660a11141b5392c6993ab9aabf85c
Andreas Gampe [Tue, 6 Feb 2018 09:04:38 +0000 (09:04 +0000)]
Merge "Frameworks: Mark tests"
am:
c86b195cd5
Change-Id: I07af71812c623a14bd8df098e9991a331bdecbc2
Treehugger Robot [Tue, 6 Feb 2018 06:03:09 +0000 (06:03 +0000)]
Merge "Frameworks: Mark tests"
Stanley Tng [Tue, 6 Feb 2018 03:27:07 +0000 (03:27 +0000)]
Merge "Add function to change LE Tx Data Length" am:
383a7d432f
am:
cffe307fa5
Change-Id: I02a15bfc36d8c8817c45e4c6f56ebbfbbf571338
Brad Ebinger [Tue, 6 Feb 2018 03:16:39 +0000 (03:16 +0000)]
Merge changes from topic "ims_apis" am:
de65acb915
am:
77230a0b3f
Change-Id: Ifd9a6ee66dae58dc3c1bfec6d7d6eed4f64a6b72
Brad Ebinger [Tue, 6 Feb 2018 03:11:36 +0000 (03:11 +0000)]
Make ImsService API @SystemApi am:
0e370b4a02
am:
a690700bca
Change-Id: Idd65b968636b4ee8bffe982afdb86f35db695ac2
Brad Ebinger [Tue, 6 Feb 2018 03:07:16 +0000 (03:07 +0000)]
Integrate new MMTel APIs into the framework am:
5b1883b5f1
am:
e904f40820
Change-Id: I3e6276418b2c6330bce65289f589980d4666de6a
Stanley Tng [Tue, 6 Feb 2018 03:06:49 +0000 (03:06 +0000)]
Merge "Add function to change LE Tx Data Length"
am:
383a7d432f
Change-Id: I5e4e634b7265d3673a2142fc629d381d4b16b491
Brad Ebinger [Tue, 6 Feb 2018 03:03:30 +0000 (03:03 +0000)]
Integrate ImsCallSessionListener API changes am:
6ed4ee6847
am:
d627bb5039
Change-Id: Ia445ff1153483813d29b85723437b356da9996e2
Stanley Tng [Tue, 6 Feb 2018 01:02:33 +0000 (01:02 +0000)]
Merge "Add function to change LE Tx Data Length"
Brad Ebinger [Mon, 5 Feb 2018 23:15:38 +0000 (23:15 +0000)]
Merge changes from topic "ims_apis"
am:
de65acb915
Change-Id: I717387907dde9f10fd61bbeb20e3533aeaeab220
Brad Ebinger [Mon, 5 Feb 2018 23:10:53 +0000 (23:10 +0000)]
Make ImsService API @SystemApi
am:
0e370b4a02
Change-Id: I7e0e8d26e842d78999138fe09e1fc9e5951a6506
Brad Ebinger [Mon, 5 Feb 2018 23:05:33 +0000 (23:05 +0000)]
Integrate new MMTel APIs into the framework
am:
5b1883b5f1
Change-Id: Id45f87f7399ddd8c2fd0046f5fa3f5364ec5f583
Brad Ebinger [Mon, 5 Feb 2018 22:59:45 +0000 (22:59 +0000)]
Integrate ImsCallSessionListener API changes
am:
6ed4ee6847
Change-Id: I41d63714efc2843fd7b1870fc99cefed074f91c3
Daniel Nishi [Mon, 5 Feb 2018 21:04:20 +0000 (21:04 +0000)]
Merge "Update diskstats to break out code & data." into oc-mr1-dev
am:
ca589a064e
Change-Id: Icb380ba195ec25c7eacf2dc4c89639bc2a325fb8
TreeHugger Robot [Mon, 5 Feb 2018 20:47:15 +0000 (20:47 +0000)]
Merge "Update diskstats to break out code & data." into oc-mr1-dev
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 [Mon, 5 Feb 2018 00:39:54 +0000 (00:39 +0000)]
Merge "Update OWNER files for connectivity" am:
771e229a23
am:
ce0c31d392
Change-Id: I5a995856aa347874b534312212ca73ffff0193c0
Hugo Benichi [Mon, 5 Feb 2018 00:30:14 +0000 (00:30 +0000)]
Merge "Update OWNER files for connectivity"
am:
771e229a23
Change-Id: I6daf999785a855ab2a7c97f113f5f8ec87a13256
Stanley Tng [Tue, 16 Jan 2018 18:39:32 +0000 (10:39 -0800)]
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
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 06:19:08 +0000 (06:19 +0000)]
Merge "Added data service configuration support" am:
2e9bdd78f2
am:
de0d22d73a
Change-Id: I47f6d9669c39060d70ba156bc121421c3dba9537
Jack Yu [Sat, 3 Feb 2018 06:09:36 +0000 (06:09 +0000)]
Merge "Added permission for binding data service" am:
0276f4290f
am:
f5d3e300b3
Change-Id: Id159d6a83658e5c2fa1b22fd27459287cc37bff3
Jack Yu [Sat, 3 Feb 2018 06:06:42 +0000 (06:06 +0000)]
Merge "Added data service configuration support"
am:
2e9bdd78f2
Change-Id: Idc7da08a22dd13f508d37df31966fb8346485ec4
Jack Yu [Sat, 3 Feb 2018 06:00:15 +0000 (06:00 +0000)]
Merge "Added permission for binding data service"
am:
0276f4290f
Change-Id: I22bf93b3233f8b1bf8edceaf64a6956a4517def6
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 04:21:58 +0000 (04:21 +0000)]
Merge "Add function to update LE connection parameters" am:
853628db72
am:
c3afcfc38c
Change-Id: Ib35d2c5314dcf6d12abf4d097b10dfc5df34bb55
Stanley Tng [Sat, 3 Feb 2018 04:10:22 +0000 (04:10 +0000)]
Merge "Add function to update LE connection parameters"
am:
853628db72
Change-Id: I7a6a653fa9d007a71e5155180fc8e78289ad9b81
weijuncheng [Sat, 3 Feb 2018 01:37:33 +0000 (01:37 +0000)]
Merge "Add DENSITY_440" am:
6c40bbdc5e
am:
a21fa41755
Change-Id: I3024b00c5060d7f6055d1e2e60a36061a10bf0ad
Stanley Tng [Sat, 3 Feb 2018 01:36:03 +0000 (01:36 +0000)]
Merge "Add function to update LE connection parameters"
Beverly [Sat, 3 Feb 2018 01:31:52 +0000 (01:31 +0000)]
Merge "DO NOT MERGE volume shows when status bar is null" am:
b5993cfb8e -s ours
am:
9cd12a53b2
Change-Id: I31770f7e9c9a84bd37dcfaacef3f0ca840876918
Pavel Maltsev [Sat, 3 Feb 2018 01:25:34 +0000 (01:25 +0000)]
Merge "Enable multiple active Ethernet interfaces" am:
0a6c539901
am:
ac908d6728
Change-Id: I95a4e5d519857950297f5948525990c4808cd5fd
Hall Liu [Sat, 3 Feb 2018 01:17:54 +0000 (01:17 +0000)]
Merge "Add missing return statement in setTempFileRootDirectory" am:
d281b1a116
am:
a376949816
Change-Id: Ib940c4a54821c23aff204e01a0bd097615864415
weijuncheng [Sat, 3 Feb 2018 01:16:46 +0000 (01:16 +0000)]
Merge "Add DENSITY_440"
am:
6c40bbdc5e
Change-Id: Iffc972d66f36c11e3b465fdc3ab87a5518b7e646
Beverly [Sat, 3 Feb 2018 01:12:28 +0000 (01:12 +0000)]
Merge "DO NOT MERGE volume shows when status bar is null"
am:
b5993cfb8e -s ours
Change-Id: I6751be82e3055ab8510b283dec396f782918d9bc
Pengquan Meng [Sat, 3 Feb 2018 00:08:10 +0000 (00:08 +0000)]
Merge "Use IntDef for BCD_EXTENDED_TYPE" am:
97246476a7
am:
a2311212a6
Change-Id: I228c3af0f864e97ab28806745466bc2d72e293b3
Pavel Maltsev [Sat, 3 Feb 2018 00:07:59 +0000 (00:07 +0000)]
Merge "Enable multiple active Ethernet interfaces"
am:
0a6c539901
Change-Id: Idea050a552dd3447cccebab2fc6f041bae06853e
Treehugger Robot [Sat, 3 Feb 2018 00:03:57 +0000 (00:03 +0000)]
Merge "Add DENSITY_440"
Hall Liu [Sat, 3 Feb 2018 00:01:40 +0000 (00:01 +0000)]
Merge "Add missing return statement in setTempFileRootDirectory"
am:
d281b1a116
Change-Id: I9bbe241eec6aafdf41153cbc9c410b844ef63e2c
Pengquan Meng [Fri, 2 Feb 2018 23:56:42 +0000 (23:56 +0000)]
Merge "Use IntDef for BCD_EXTENDED_TYPE"
am:
97246476a7
Change-Id: I20ac464b285c1eb2572fc8a280ee2ff4b4c1b1c3
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"
Ruchi Kandoi [Fri, 2 Feb 2018 22:13:27 +0000 (22:13 +0000)]
Merge "Add NFC Transaction Event intent actions and extras" am:
337e2feada
am:
8b35111d3e
Change-Id: Icedc6764b7b3fdf9b5706bedc3e4fe0dc0d39c58
Treehugger Robot [Fri, 2 Feb 2018 22:09:34 +0000 (22:09 +0000)]
Merge "Add missing return statement in setTempFileRootDirectory"
Ruchi Kandoi [Fri, 2 Feb 2018 22:01:34 +0000 (22:01 +0000)]
Merge "Add NFC Transaction Event intent actions and extras"
am:
337e2feada
Change-Id: I02cf168c0edff40dc6d85ad90a1f3ddc71044c91
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"
Hall Liu [Fri, 2 Feb 2018 20:46:51 +0000 (20:46 +0000)]
Merge "Rename MbmsDownloadSession#getDownloadStatus" am:
a07d895f09
am:
be305be046
Change-Id: Ic126b1cbee30edbb8f90f3a61d206bbd75aa8d5f
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:24:08 +0000 (20:24 +0000)]
Merge "Rename MbmsDownloadSession#getDownloadStatus"
am:
a07d895f09
Change-Id: I1b6b063920de4de085f583d05876e246f1f65686
Hall Liu [Fri, 2 Feb 2018 20:01:12 +0000 (20:01 +0000)]
Merge "Rename MbmsDownloadSession#getDownloadStatus"
Ruchi Kandoi [Fri, 2 Feb 2018 19:10:20 +0000 (19:10 +0000)]
Merge "Add ServiceSpecificExceptions for SecureElementService." am:
73e7a1a739
am:
e09ba38a97
Change-Id: Ida702dbb1346446bae52457860bd33b0d926be8c
Ruchi Kandoi [Fri, 2 Feb 2018 17:58:58 +0000 (17:58 +0000)]
Merge "Add ServiceSpecificExceptions for SecureElementService."
am:
73e7a1a739
Change-Id: Ib3122c4a0bcc233f6be734af4af9edad4a5c63e8
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
Chenbo Feng [Fri, 2 Feb 2018 17:02:10 +0000 (17:02 +0000)]
Merge "Return non-negetive value in getMobileStats method" am:
bb1d07e681
am:
515a54a93e
Change-Id: I54a400b4231c38db25aa1b717f302a8a52e1773e
Ruchi Kandoi [Fri, 2 Feb 2018 16:43:11 +0000 (16:43 +0000)]
Merge "Add ServiceSpecificExceptions for SecureElementService."
Chenbo Feng [Fri, 2 Feb 2018 14:42:36 +0000 (14:42 +0000)]
Merge "Return non-negetive value in getMobileStats method"
am:
bb1d07e681
Change-Id: I82e2fa1436d91fcbcfe9a5a7dbb46973b6474706
Shailesh Saini [Fri, 2 Feb 2018 07:22:42 +0000 (07:22 +0000)]
Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dev am:
7de6312dde am:
5fde1b98fb
am:
9e37b2aa10
Change-Id: If9de8bace8f8059fcffb986c87413ccefdadc5cb
Android Build Merger (Role) [Fri, 2 Feb 2018 07:16:26 +0000 (07:16 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a am:
2876452814 am:
af5c532cc8 am:
86948aa610 am:
abab079bf5 am:
ad47a2d85c am:
35a855de49 am:
6aa6390e71
am:
67a9895c18
Change-Id: Ic7acb321b09d2597db38c5f4716a07a4fdb63317
Android Build Merger (Role) [Fri, 2 Feb 2018 07:10:46 +0000 (07:10 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd am:
7caae808a8 am:
349d1c1be5 am:
94cd8a69c6 am:
389f0e5240 am:
f7b4200a5f
am:
87b7b02220
Change-Id: I3b081bf2861d84979060c8cf6d464462bdf20b9b
Adam Vartanian [Fri, 2 Feb 2018 07:05:29 +0000 (07:05 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into oc-dev am:
36c202ed80 am:
cf31e066a9
am:
f64dcd5bb5
Change-Id: I5980a614656d41f648da5a57c933533705a89c63
Hall Liu [Fri, 2 Feb 2018 04:37:13 +0000 (04:37 +0000)]
Merge "Check for location access on TelephonyRegistry" am:
871202da2f
am:
cf59665a75
Change-Id: I8eee8b62f0e41fa7346126d29266dfd555550028
Tyler Gunn [Fri, 2 Feb 2018 04:32:32 +0000 (04:32 +0000)]
Merge "Add call recording tone support." am:
8d5b08c430
am:
eb74233ff9
Change-Id: I1111bc80ec7dff95e6e1a5f53da22d5e65042060
Jordan Liu [Fri, 2 Feb 2018 04:27:27 +0000 (04:27 +0000)]
Merge "Add carrier config option to show call barring UI in CallSettings" am:
2aa0cdd1d2
am:
ba0581bcf1
Change-Id: If09ae852661ab154804ad9f30a2eea0839f291c0
Treehugger Robot [Fri, 2 Feb 2018 04:22:34 +0000 (04:22 +0000)]
Merge "Return non-negetive value in getMobileStats method"
Alex Khlivnuik [Fri, 2 Feb 2018 04:18:38 +0000 (04:18 +0000)]
Merge "Add CarrierConfig to displaying HD audio indicator for GSM/CDMA calls" am:
0be23629a8
am:
c9cfb504f7
Change-Id: I1ae7bb4715c9bffb7c6b2d57da17862f7c25ad55
nharold [Fri, 2 Feb 2018 04:14:20 +0000 (04:14 +0000)]
Merge "CellSignalStrength cleanup" am:
af7435ca1f
am:
67a2db0a66
Change-Id: Ib405d3d8d2bc723dbddfaca4748bb34fcbae877a
Jack Yu [Fri, 2 Feb 2018 04:10:23 +0000 (04:10 +0000)]
Merge "Added support for the new 1.2 data setup/deactivate API" am:
a02d09a449
am:
8208b2ef2e
Change-Id: I699cc911c200c3f8d4390f19fc4cfb009c6090e9
Brad Ebinger [Fri, 2 Feb 2018 04:03:45 +0000 (04:03 +0000)]
Merge changes from topics "ims_sms_sms_ready", "ims_sms_rm_internal_sms", "ims_sms_disp" am:
d6d9ff3c2d
am:
2390485616
Change-Id: I65687184fd12088804a905518b3613b2444be7eb
Shailesh Saini [Fri, 2 Feb 2018 03:57:18 +0000 (03:57 +0000)]
Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dev am:
7de6312dde
am:
5fde1b98fb
Change-Id: Ie88ec3204c1ae169507e6a9d22024188a229b3c1
Android Build Merger (Role) [Fri, 2 Feb 2018 03:53:02 +0000 (03:53 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a am:
2876452814 am:
af5c532cc8 am:
86948aa610 am:
abab079bf5 am:
ad47a2d85c am:
35a855de49
am:
6aa6390e71
Change-Id: I7ab0827f6109f89893ede5b8f91d19e8236a49e4
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
Android Build Merger (Role) [Fri, 2 Feb 2018 03:49:25 +0000 (03:49 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd am:
7caae808a8 am:
349d1c1be5 am:
94cd8a69c6 am:
389f0e5240
am:
f7b4200a5f
Change-Id: Id222c2407af4807631e3d2d588fff3c67d00d3c0
Adam Vartanian [Fri, 2 Feb 2018 03:46:04 +0000 (03:46 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into oc-dev am:
36c202ed80
am:
cf31e066a9
Change-Id: I774ce7a4046548222c3a0d913bbfcc3e0759ede3
Hall Liu [Fri, 2 Feb 2018 03:42:38 +0000 (03:42 +0000)]
Merge "Check for location access on TelephonyRegistry"
am:
871202da2f
Change-Id: Ibe61ae68be0b451e0ac135b1e68d1c687586887c
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
Tyler Gunn [Fri, 2 Feb 2018 00:24:39 +0000 (00:24 +0000)]
Merge "Add call recording tone support."
am:
8d5b08c430
Change-Id: Ie99332c73bed7681e05a2e7603da2c5c573a95f3
Jordan Liu [Fri, 2 Feb 2018 00:19:19 +0000 (00:19 +0000)]
Merge "Add carrier config option to show call barring UI in CallSettings"
am:
2aa0cdd1d2
Change-Id: Id5dfe845419d4b084decb6dab04f1e701068c4d4
Alex Khlivnuik [Fri, 2 Feb 2018 00:08:21 +0000 (00:08 +0000)]
Merge "Add CarrierConfig to displaying HD audio indicator for GSM/CDMA calls"
am:
0be23629a8
Change-Id: I122612a24a1908700bceb790f2309aebb15bed09
nharold [Fri, 2 Feb 2018 00:04:04 +0000 (00:04 +0000)]
Merge "CellSignalStrength cleanup"
am:
af7435ca1f
Change-Id: I90cffed716a7bf830862b396597a97d1233e9afd
Shailesh Saini [Thu, 1 Feb 2018 23:58:25 +0000 (23:58 +0000)]
Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dev
am:
7de6312dde
Change-Id: I8823151ab194dab137c8f8632e59ad67210379fc
Jack Yu [Thu, 1 Feb 2018 23:54:10 +0000 (23:54 +0000)]
Merge "Added support for the new 1.2 data setup/deactivate API"
am:
a02d09a449
Change-Id: I8c49b9296e863244bf49ff806d319b2e1be326be
Android Build Merger (Role) [Thu, 1 Feb 2018 23:53:22 +0000 (23:53 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a am:
2876452814 am:
af5c532cc8 am:
86948aa610 am:
abab079bf5 am:
ad47a2d85c
am:
35a855de49
Change-Id: I2c50c4a78bc670e13c5a7bd4f9fec078fb7d40a9
Android Build Merger (Role) [Thu, 1 Feb 2018 23:50:39 +0000 (23:50 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd am:
7caae808a8 am:
349d1c1be5 am:
94cd8a69c6
am:
389f0e5240
Change-Id: I127c7f52e2adc246784f750a4ccb1f494bbdb245
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 [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 [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
Adam Vartanian [Thu, 1 Feb 2018 23:44:18 +0000 (23:44 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into oc-dev
am:
36c202ed80
Change-Id: Ieb4b5cd2cafd20d4898bc781c43e41d3bed0d7dc
OSDN Git Service
