drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
358,544 Commits 1 Branch 0 Tags
Commit Graph

5756 Commits

Author SHA1 Message Date
Chen Xu
e8b3a537d3 Merge "add a current table in CarrierIdProvider" 2018-02-10 05:46:49 +00:00
Tyler Gunn
0fc03bb297 Merge "Add Connection Event for supplementary service notifications." am: efccc1babe am: 4d2dae8f0c 
am: cb64e33660

Change-Id: I782179c6a96d7a953c3201943726ae1e34735ca8
 2018-02-10 00:25:05 +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
Jiuyu Sun
b6276fe5a3 Merge "Revert "Public EuiccManager APIs."" 2018-02-08 17:34:30 +00:00
Jiuyu Sun
d3bb4aed78 Revert "Public EuiccManager APIs." 
This reverts commit af6a5fffdc5ef30065f8bc2d1280bbd87eae3c64.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Id3296a91e5c3ad624a6a03f6532b859524a518bf
 2018-02-08 16:38:26 +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
cfa16ec443 Merge "IMS: Add support in frameworks for call deflection feature" am: ba0f9d2973 am: f39bef4801 
am: ac48eed9c0

Change-Id: I4695aca7d886f37341672ea5815770e3ccdf7a51
 2018-02-08 02:15:56 +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
Jiuyu Sun
7fdd2bf7c1 Merge "Public EuiccManager APIs." 2018-02-07 23:55:28 +00:00
TreeHugger Robot
263bff47be Merge "Add interfact to get phone ID from UiccSlotInfo" 2018-02-07 23:31:37 +00:00
Treehugger Robot
4c8fa81d17 Merge "Make TelephonyManager#getNai() public" 2018-02-07 23:17:18 +00:00
Holly Jiuyu Sun
af6a5fffdc 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: Id7895f9b35ce9d4fb6fae42ba89ca9b29dbfa74c
 2018-02-07 11:09:27 -08: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
Hall Liu
520b975ded Merge "Revert "Check for location access on TelephonyRegistry"" am: 39393f889a am: 772d17c263 
am: 07e1d78346

Change-Id: I9ab304409e6f777593e6c927bb0d76b8f82038fc
 2018-02-07 03:16:29 +00:00
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
Qingxi Li
fada6f73ff Add interfact to get phone ID from UiccSlotInfo 
Bug: 72753162
Test: TreeHugger
Change-Id: I7733a5f60cf4535339fe9b44e99178304ccbb2c0
 2018-02-06 14:36:51 -08: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 8d584f0a91b0709b28ebc64abf0a6063429c8d58.

Reason for revert: b/72967560

Change-Id: I9ca3c4a586e740a7b7d4cc5940ca8d4e4ebf3654
 2018-02-06 18:13:36 +00:00
Pankaj Kanwar
f7a84a6c4b Merge "Fix the function to get baseband version correctly in telephony manager." 2018-02-06 05:13:23 +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
pkanwar
ffe6a84e52 Fix the function to get baseband version correctly in telephony manager. 
Bug: 62281863
Test: manual
Change-Id: I58cefcf9651e2dbe4058a8eca6a0875153df0b90
 2018-02-05 18:48:36 -08: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
fionaxu
3d00d698d7 add a current table in CarrierIdProvider 
restructure CarrierIdProvider into two tables
1. All - a private table which stores a complete mapping of all carriers
2. Current - a public table only stores the carrier identification of the
current active subs. require no permission to query.
expose the content url to public so that apps could be
notified on carrier identity change either on background or foreground.

Bug: 72571475
Test: runtest --path CarrierIdProviderTest.java
Test: Manual
Change-Id: If2a20288e63d25343f5bb582b35564d769a4e13b
 2018-02-05 14:47:31 -08: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
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
Xiangyu/Malcolm Chen
121647fe22 Merge "Update ServiceState to adapt NetworkService change." 2018-02-04 23:12:34 +00:00
Jack Yu
0c5f8dfaca resolve merge conflicts of c3415d2bc61c52c9dba8cee8f7587580ede53941 to master 
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I072c3d46b81dee0a83036ea7d5e91bd1989fa250
 2018-02-03 20:42:01 -08:00
Malcolm Chen
5ad2092112 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
 2018-02-04 01:12:05 +00:00
Xiangyu/Malcolm Chen
1b368de832 Merge "Add strings and carrier config needed network service." 2018-02-04 01:11:03 +00:00
Hall Liu
3918780c28 Merge "Add missing return statement in setTempFileRootDirectory" am: d281b1a116 am: a376949816 
am: 048b1517b4

Change-Id: I261b953da7e9edb048becbfcfffb3925f2371ec2
 2018-02-04 00:57:17 +00:00
Pengquan Meng
099ede2617 Merge "Use IntDef for BCD_EXTENDED_TYPE" am: 97246476a7 am: a2311212a6 
am: a8f341c47a

Change-Id: I5ddcab70828fec9f59de920feb085c867bd0059e
 2018-02-04 00:49:55 +00:00
Hall Liu
e35ef2778e Merge "Rename MbmsDownloadSession#getDownloadStatus" am: a07d895f09 am: be305be046 
am: c8cb3aad58

Change-Id: I0c5313fef938e6d9dfbb7779f336a3e3b34fe6c2
 2018-02-04 00:05:22 +00: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
Malcolm Chen
ec1022121b 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
 2018-02-02 17:32:48 -08: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