Commit Graph

5423 Commits

Author SHA1 Message Date
Holly Jiuyu Sun
02d43443d0 Merge "Public EuiccManager APIs." am: 42339c464f
am: cddc0c12cc

Change-Id: I01d436c16df678292c8aec1f3ea2d7a65f3e10dd
2018-02-14 00:24:46 +00:00
Holly Jiuyu Sun
42339c464f Merge "Public EuiccManager APIs." 2018-02-13 22:56:08 +00:00
Qingxi Li
0f804fa225 Merge "Add interfact to get phone ID from UiccSlotInfo" am: 909e9d3e49
am: feba71b4ef

Change-Id: I4c65138fd4283c2023737c294f92d82346943157
2018-02-13 22:19:02 +00:00
Holly Jiuyu Sun
052fbabc35 Public EuiccManager APIs.
Public EuiccManager and other related necessary files.
Mark EuiccCardManager and other related necessary files as @SystemApi.
Solve lint errors and warnings.

Bug: 35851809
Test: test on phone
Change-Id: I8a2c78804cae56b679d311d613edca5be4bc2522
Merged-In: I68853e134e1e31fa9b91a83af6c491a2a8cca971
2018-02-13 12:53:45 -08:00
Qingxi Li
4d7025fc1d Add interfact to get phone ID from UiccSlotInfo
Bug: 72753162
Test: TreeHugger
Merged-In: I7733a5f60cf4535339fe9b44e99178304ccbb2c0
Change-Id: I7733a5f60cf4535339fe9b44e99178304ccbb2c0
2018-02-13 19:29:00 +00:00
Jack Yu
7532fc8bb9 Merge "Added owners" am: 492f249dbb
am: ea014edb58

Change-Id: I6c7ff430af33899c534a9f70139ef7cf6cc1cfbf
2018-02-13 00:49:42 +00:00
Jack Yu
492f249dbb Merge "Added owners" 2018-02-12 22:39:00 +00:00
Jordan Liu
de387f3298 Merge "Overload setTelephonyProperty without phone ID" am: f27242dbd6
am: 22189a729a

Change-Id: I9d8182751f5303258083e0b0d0825902d06225d1
2018-02-12 20:19:37 +00:00
Jack Yu
5424174152 Added owners
Test: Build
Change-Id: I95104f646bc054e4ad9a6807d6e3df69f1e00d75
2018-02-12 12:07:34 -08:00
Jordan Liu
f27242dbd6 Merge "Overload setTelephonyProperty without phone ID" 2018-02-12 18:17:24 +00:00
Tyler Gunn
cb64e33660 Merge "Add Connection Event for supplementary service notifications." am: efccc1babe
am: 4d2dae8f0c

Change-Id: Ide105970d9c91f2fa5e2ec14410da011918d92ec
2018-02-10 00:11:19 +00:00
Tyler Gunn
ea72eacc45 Add Connection Event for supplementary service notifications.
These are passed up to the UI with an optional charsequence message which
the UI can choose to display to the user.

Test: Manual, added new unit tests
Bug: 65534165
Change-Id: Icdf2738ac4dfd3a65e9eacac2caa4d4a44348ab4
2018-02-08 21:34:13 +00:00
goneil
bdfb401070 Merge "Make TelephonyManager#getNai() public" am: 4c8fa81d17
am: b731583b7a

Change-Id: Ia251ab0241f2e365556dbd4db663ead53af22d92
2018-02-08 02:40:21 +00:00
Pooja Jain
ac48eed9c0 Merge "IMS: Add support in frameworks for call deflection feature" am: ba0f9d2973
am: f39bef4801

Change-Id: I843ae3caed5b066398e76825ea4e2753904b1f54
2018-02-08 01:27:45 +00:00
Treehugger Robot
4c8fa81d17 Merge "Make TelephonyManager#getNai() public" 2018-02-07 23:17:18 +00:00
Pooja Jain
d34698def5 IMS: Add support in frameworks for call deflection feature
Call deflection feature is useful to deflect MT call to another
number.

Test: Manual

Bug: 62170348
Change-Id: Idfbcc175a856aa0bb9476f8c73d7a614a3af0700
2018-02-07 12:29:16 +05:30
Xiangyu/Malcolm Chen
ec00ab16ca Merge "Update ServiceState to adapt NetworkService change." am: 1168c31c4a
am: bc1ea668f9

Change-Id: I306cb270ed1d9286739117ea0f6cb5770108ba8e
2018-02-06 23:36:52 +00:00
Hall Liu
07e1d78346 Merge "Revert "Check for location access on TelephonyRegistry"" am: 39393f889a
am: 772d17c263

Change-Id: I7e2fd26aad4c09bca97142279434fb108abae848
2018-02-06 23:28:17 +00:00
Malcolm Chen
d7672c6f49 Merge "Add strings and carrier config needed network service." am: a3ccb8d854
am: 0c2a5852f5

Change-Id: I51a4792545c4fb06611681ef2f4ca1183f2fd61a
2018-02-06 23:14:06 +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
Hall Liu
3d30946e8e Revert "Check for location access on TelephonyRegistry"
This reverts commit 8d584f0a91.

Reason for revert: b/72967560

Change-Id: I9ca3c4a586e740a7b7d4cc5940ca8d4e4ebf3654
2018-02-06 18:13:36 +00:00
Brad Ebinger
83d77063a8 Merge changes from topic "ims_apis" am: de65acb915
am: 77230a0b3f

Change-Id: Ifd9a6ee66dae58dc3c1bfec6d7d6eed4f64a6b72
2018-02-06 03:16:39 +00:00
Brad Ebinger
ade4691364 Make ImsService API @SystemApi am: 0e370b4a02
am: a690700bca

Change-Id: Idd65b968636b4ee8bffe982afdb86f35db695ac2
2018-02-06 03:11:36 +00:00
Brad Ebinger
a210f34020 Integrate new MMTel APIs into the framework am: 5b1883b5f1
am: e904f40820

Change-Id: I3e6276418b2c6330bce65289f589980d4666de6a
2018-02-06 03:07:16 +00:00
Brad Ebinger
2c5dc6b6a0 Integrate ImsCallSessionListener API changes am: 6ed4ee6847
am: d627bb5039

Change-Id: Ia445ff1153483813d29b85723437b356da9996e2
2018-02-06 03:03:30 +00:00
Brad Ebinger
a690700bca Make ImsService API @SystemApi
am: 0e370b4a02

Change-Id: I7e0e8d26e842d78999138fe09e1fc9e5951a6506
2018-02-05 23:10:53 +00:00
Brad Ebinger
e904f40820 Integrate new MMTel APIs into the framework
am: 5b1883b5f1

Change-Id: Id45f87f7399ddd8c2fd0046f5fa3f5364ec5f583
2018-02-05 23:05:33 +00:00
Brad Ebinger
d627bb5039 Integrate ImsCallSessionListener API changes
am: 6ed4ee6847

Change-Id: I41d63714efc2843fd7b1870fc99cefed074f91c3
2018-02-05 22:59:45 +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
Mengjun Leng
f9ddcf69b2 Overload setTelephonyProperty without phone ID
Some properties are not per-phone.

Test: ServiceStateTrackerTest.java
Fixes: 62048110
Change-Id: I80ffc85b511e6a173a1dee50412b1fc48ef43d90
2018-02-05 13:11:46 -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
goneil
317b05a055 Make TelephonyManager#getNai() public
Bug: 67750905
Test: android.telephony.cts.TelephonyManagerTest#testTelephonyManager
Change-Id: I92af07a5ed2abd852ff0f79909c574d78b89f535
2018-02-05 10:15:12 -08:00
Jack Yu
c3415d2bc6 Merge "Added data service configuration support" am: 2e9bdd78f2
am: de0d22d73a

Change-Id: I47f6d9669c39060d70ba156bc121421c3dba9537
2018-02-03 06:19:08 +00:00
Jack Yu
2e9bdd78f2 Merge "Added data service configuration support" 2018-02-03 04:40:46 +00:00
Hall Liu
048b1517b4 Merge "Add missing return statement in setTempFileRootDirectory" am: d281b1a116
am: a376949816

Change-Id: Ib940c4a54821c23aff204e01a0bd097615864415
2018-02-03 01:17:54 +00:00
Pengquan Meng
a8f341c47a Merge "Use IntDef for BCD_EXTENDED_TYPE" am: 97246476a7
am: a2311212a6

Change-Id: I228c3af0f864e97ab28806745466bc2d72e293b3
2018-02-03 00:08:10 +00:00
Treehugger Robot
d281b1a116 Merge "Add missing return statement in setTempFileRootDirectory" 2018-02-02 22:09:34 +00:00
Pengquan Meng
97246476a7 Merge "Use IntDef for BCD_EXTENDED_TYPE" 2018-02-02 21:32:11 +00:00
Hall Liu
c8cb3aad58 Merge "Rename MbmsDownloadSession#getDownloadStatus" am: a07d895f09
am: be305be046

Change-Id: Ic126b1cbee30edbb8f90f3a61d206bbd75aa8d5f
2018-02-02 20:46:51 +00:00
Hall Liu
a07d895f09 Merge "Rename MbmsDownloadSession#getDownloadStatus" 2018-02-02 20:01:12 +00:00
Hall Liu
56e6bd2cd1 Merge "Check for location access on TelephonyRegistry" am: 871202da2f
am: cf59665a75

Change-Id: I8eee8b62f0e41fa7346126d29266dfd555550028
2018-02-02 04:37:13 +00:00
Tyler Gunn
29d94726be Merge "Add call recording tone support." am: 8d5b08c430
am: eb74233ff9

Change-Id: I1111bc80ec7dff95e6e1a5f53da22d5e65042060
2018-02-02 04:32:32 +00:00
Jordan Liu
32d87828e0 Merge "Add carrier config option to show call barring UI in CallSettings" am: 2aa0cdd1d2
am: ba0581bcf1

Change-Id: If09ae852661ab154804ad9f30a2eea0839f291c0
2018-02-02 04:27:27 +00:00
Alex Khlivnuik
114adea744 Merge "Add CarrierConfig to displaying HD audio indicator for GSM/CDMA calls" am: 0be23629a8
am: c9cfb504f7

Change-Id: I1ae7bb4715c9bffb7c6b2d57da17862f7c25ad55
2018-02-02 04:18:38 +00:00
nharold
252aeb18cb Merge "CellSignalStrength cleanup" am: af7435ca1f
am: 67a2db0a66

Change-Id: Ib405d3d8d2bc723dbddfaca4748bb34fcbae877a
2018-02-02 04:14:20 +00:00
Jack Yu
4fcd48db4b Merge "Added support for the new 1.2 data setup/deactivate API" am: a02d09a449
am: 8208b2ef2e

Change-Id: I699cc911c200c3f8d4390f19fc4cfb009c6090e9
2018-02-02 04:10:23 +00:00
Brad Ebinger
a7e7cfdedf Merge changes from topics "ims_sms_sms_ready", "ims_sms_rm_internal_sms", "ims_sms_disp" am: d6d9ff3c2d
am: 2390485616

Change-Id: I65687184fd12088804a905518b3613b2444be7eb
2018-02-02 04:03:45 +00: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