Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
355,920 Commits 3 Branches 0 Tags
1bfb3d2160367ef11615e0b024cf5f6179d282dc
Commit Graph

5614 Commits

Author SHA1 Message Date
Holly Jiuyu Sun
078de80ba7 Merge "Fill in methods in EuiccCardController." am: 197f072da2 am: d143bb628a 
am: d19ef3fa1b

Change-Id: I8189d3b34e4966c873e689c8c90ca6a8f2b2ec49
 2018-01-25 22:21:13 +00:00
Holly Jiuyu Sun
d19ef3fa1b Merge "Fill in methods in EuiccCardController." am: 197f072da2 
am: d143bb628a

Change-Id: I327158452fb1fc341de7a31c9004aa757406d9bd
 2018-01-25 22:06:08 +00:00
Holly Jiuyu Sun
197f072da2 Merge "Fill in methods in EuiccCardController." 2018-01-25 17:22:50 +00:00
Eric Schwarzenbach
fd4881c53f Merge "Update CellInfo API to accomodate new fields." am: 7e73c73f89 am: 4dac182030 
am: 55373d0549

Change-Id: I39620f4dd3afd57835c1c48e36e94f8028102edb
 2018-01-25 16:05:05 +00:00
Eric Schwarzenbach
79f2ea2d7d Merge "Add ServiceState APIs for carrier aggregation." am: 185a89caf1 am: d529242eea 
am: a0414ed567

Change-Id: I09b5a5955ace18d045f20a5d39b93d8e30096816
 2018-01-25 15:51:19 +00:00
Eric Schwarzenbach
55373d0549 Merge "Update CellInfo API to accomodate new fields." am: 7e73c73f89 
am: 4dac182030

Change-Id: Ifef2f68a49fb74c11fb845590e08040972f7d27b
 2018-01-25 15:49:59 +00:00
Malcolm Chen
58b90eb578 Merge "Add slotId in INetworkService.aidl methods." am: b1c6aa4567 am: 9348e258cd 
am: 6ec70f018e

Change-Id: Ifbbdd159c3cd52282d6a4bdd58c1ddeeff4cc912
 2018-01-25 15:30:37 +00:00
Eric Schwarzenbach
a0414ed567 Merge "Add ServiceState APIs for carrier aggregation." am: 185a89caf1 
am: d529242eea

Change-Id: Id55c68bed1fceff1d6d83793b190188b42d99435
 2018-01-25 15:23:48 +00:00
Malcolm Chen
6ec70f018e Merge "Add slotId in INetworkService.aidl methods." am: b1c6aa4567 
am: 9348e258cd

Change-Id: I0dba0926979d53951cea53761a4527b246fcb98e
 2018-01-25 15:19:06 +00:00
Treehugger Robot
7e73c73f89 Merge "Update CellInfo API to accomodate new fields." 2018-01-25 12:50:37 +00:00
TreeHugger Robot
9543d6eb65 Merge changes from topic "sms_ready" 
* changes:
  Unhide SMS over IMS APIs
  Add and trigger onReady API for SMS over IMS.
 2018-01-25 12:11:34 +00:00
Treehugger Robot
185a89caf1 Merge "Add ServiceState APIs for carrier aggregation." 2018-01-25 07:47:55 +00:00
Eric Schwarzenbach
a9d9b021be Update CellInfo API to accomodate new fields. 
Adds CellConnectionStatus to top level CellInfo type. Adds cell bandwidth
to the CellIdentityLte.

Bug: 72117223
Test: runtest frameworks-telephony

Change-Id: Id5f3b5a2bd4119c099f5e739d5579974e7adc897
 2018-01-25 07:25:04 +00:00
Treehugger Robot
b1c6aa4567 Merge "Add slotId in INetworkService.aidl methods." 2018-01-25 07:13:17 +00:00
Jun Yin
c949502b95 Merge "Adds stripTrailingFs" am: 27bb333e14 am: a91491a3b8 
am: 76e05493b4

Change-Id: Ie4c5994131a97b9acbe445abef3f4c6e73009732
 2018-01-25 03:42:45 +00:00
Jun Yin
76e05493b4 Merge "Adds stripTrailingFs" am: 27bb333e14 
am: a91491a3b8

Change-Id: I6b850d252fb40395bc312f4ed8be383153af52ef
 2018-01-25 03:34:13 +00:00
Amit Mahajan
9399343f42 Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED." am: 7b9a785d65 am: e2075c2c7d 
am: fd8df8236f

Change-Id: I9590dbc72f27180e3f6e6efed1dea776074ed025
 2018-01-25 03:29:29 +00:00
Amit Mahajan
fd8df8236f Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED." am: 7b9a785d65 
am: e2075c2c7d

Change-Id: Ib3e807a900fcc548e88f10b4622e8203fe6d72be
 2018-01-25 02:59:04 +00:00
Mohamed Abdalkader
9cb476bb10 Unhide SMS over IMS APIs 
While here add more constants for send sms result.

Test: manual
BUG:69846044
Change-Id: I66fdcff51dc5ded9f6199d09bb667c89f38b6d59
 2018-01-25 02:52:43 +00:00
Treehugger Robot
27bb333e14 Merge "Adds stripTrailingFs" 2018-01-25 02:44:26 +00:00
Holly Jiuyu Sun
321977a191 Fill in methods in EuiccCardController. 
Add RESULT_UNKNOWN in EuiccCardManager.

Bug: 38206971
Test: test on phone
Change-Id: I972ba0ab5ff6bb8e6ef50c8684a19bb9cd48a721
 2018-01-24 18:22:21 -08:00
Malcolm Chen
d272880c90 Add slotId in INetworkService.aidl methods. 
Since one Service can only return same binder to all connected
clients, we add slotId in INetworkService.aidl methods to redirect
requests to correct provider.

Bug: 64132030
Test: build
Change-Id: Iae5d81a689a43ed783d7dff0f51735c42a6483be
 2018-01-25 01:37:59 +00:00
Eric Schwarzenbach
09a7773583 Add ServiceState APIs for carrier aggregation. 
Adds getDuplexMode, getChannelNumber, and getCellBandwidths to
ServiceState.

Bug: 72117602
Test: runtest
Change-Id: I04be7d0a7d88693ef21b252ecc21aa974c2f89c8
 2018-01-25 01:10:29 +00:00
Nathan Harold
1e39ade047 Merge changes from topic "keepalive-on-cell" 
* changes:
  Rework KeepalivePacketData for Compatibility with Cell
  Add Constants for NATT Keepalive to RILConstants
  Relocate KeepalivePacketData to frameworks/base
 2018-01-25 00:48:43 +00:00
Holly Jiuyu Sun
047707c7aa Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am: ec44a402d2 am: 596c22a84d 
am: 07b212b788

Change-Id: I771845c9f07aa18946c0ab99fffd2a08d888e819
 2018-01-24 23:37:16 +00:00
Holly Jiuyu Sun
07b212b788 Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am: ec44a402d2 
am: 596c22a84d

Change-Id: I6320f2195eeb2221fb29778b6171c3ebdb3f8dac
 2018-01-24 23:24:29 +00:00
Mohamed Abdalkader
bddbd624ec 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
Change-Id: Icb15ca4aa6606fba641f6270dca5e0e06fc4466a
 2018-01-24 15:07:24 -08:00
Android Build Merger (Role)
9f1dd93b2a Merge "Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." am: 7a481bde6d am: f343e33dd5 am: e39de15109" 2018-01-24 22:39:45 +00:00
Tyler Gunn
c3f129c795 Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." am: 7a481bde6d am: f343e33dd5 
am: e39de15109

Change-Id: I48b1c82a051342b6a4504290a6297aebc8a2bdfd
 2018-01-24 22:38:52 +00:00
Android Build Merger (Role)
71df9bf176 Merge "Merge "Added network service interface" am: 71793be6bb am: 2b06789511 am: 3748d15321" 2018-01-24 22:33:21 +00:00
Xiangyu/Malcolm Chen
7783ecd755 Merge "Added network service interface" am: 71793be6bb am: 2b06789511 
am: 3748d15321

Change-Id: Ia08a840e47d3372772a105ef7b65bb259d07e7f8
 2018-01-24 22:32:56 +00:00
Amit Mahajan
8a4275f09f Update comments for ACTION_CARRIER_CONFIG_CHANGED. 
Test: none
Bug: 64131518
Change-Id: I7efbbb393289cc11d529898ea3d7f96b0e89f445
 2018-01-24 14:30:38 -08:00
Holly Jiuyu Sun
ec44a402d2 Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" 2018-01-24 21:11:07 +00:00
Tyler Gunn
e39de15109 Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." am: 7a481bde6d 
am: f343e33dd5

Change-Id: Ia3e538e18d4fdf1770ee15b06d256c6e79051ebf
 2018-01-24 21:06:48 +00:00
Xiangyu/Malcolm Chen
3748d15321 Merge "Added network service interface" am: 71793be6bb 
am: 2b06789511

Change-Id: I88aeed6b03d39e7555ad9de62b954eac62da3f79
 2018-01-24 20:55:01 +00:00
Jun Yin
b40a26c43d Adds stripTrailingFs 
This function removes padding 'F' characters in a string (e.g., ICCID).

Bug: 38206971
Test: unit test in another cl
Change-Id: If77604576c5bd26404cdc436f8297191664325a4
 2018-01-24 12:33:05 -08:00
Treehugger Robot
7a481bde6d Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." 2018-01-24 19:33:33 +00:00
Jack Yu
d5f1de19f4 Added network service interface 
The interface for mobile network service. This is the base class
for vendor or first party data service provider to implement
the network service for cellular or IWLAN network support.

Test: Manual
bug: 64132030
Change-Id: Ia358cbb18fc6d15dcc45c75f14b7c952f899e101
 2018-01-24 19:13:45 +00:00
Nathan Harold
974aada047 Add Constants for NATT Keepalive to RILConstants 
Bug: 38350389
Test: compilation
Change-Id: Ic18a7c947d2c62efe76d656bd683f9ce296f68fd
 2018-01-24 10:26:04 -08:00
Holly Jiuyu Sun
0ee6dfee1a Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" 
This reverts commit 5c9dcc0e72.

Reason for revert: The original failure was not caused by this CL and this CL does not depend on the broken one.

Change-Id: Ia60e21f634d8f307f1cf5a3992cb38de04c5f443
 2018-01-24 17:57:39 +00:00
Mohamed Abdalkader
48e18c5b4f Remove internal version of SMS apis 
Test: manual
BUG=69846044
Change-Id: Ie084ea67c460c686bd587e4b36f8c1579517ea7f
 2018-01-24 17:57:26 +00:00
Eric Schwarzenbach
df5e92833e Merge "Add PhysicalChannelConfig." am: c584d2772d am: 3deaafd8cd 
am: 9d3738232c

Change-Id: I707415785137603f787ff5e12035d58980a21d18
 2018-01-24 17:02:09 +00:00
Eric Schwarzenbach
9d3738232c Merge "Add PhysicalChannelConfig." am: c584d2772d 
am: 3deaafd8cd

Change-Id: Id6ec6d693ec05d363b2847d0e4eee72fea24aef9
 2018-01-24 16:52:03 +00:00
Eric Schwarzenbach
c584d2772d Merge "Add PhysicalChannelConfig." 2018-01-24 16:17:53 +00:00
Nicolas Geoffray
b5928a2b81 Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" am: 1f568c14ac 
am: b91d1b3e3a

Change-Id: I8cae11d0c9e4b72bc821af2a424380adaa59847d
 2018-01-24 12:40:45 +00:00
Nicolas Geoffray
1f568c14ac Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" 2018-01-24 10:44:10 +00:00
Neil Fuller
4cfc02a316 Revert "Add getUiccSlots() and switchSlots() in TelephonyManager." 
AOSP build broken.

Bug: 71914112

This reverts commit 2f87d7b2ee.
 2018-01-24 10:07:48 +00:00
Holly Jiuyu Sun
d201c4dd51 Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." am: 8fd5b7e1c3 am: 5598f5ab23 
am: 687a28d77d

Change-Id: I56abcc7731ca08ed67a5123f826bfbc9ca4f74d0
 2018-01-24 09:42:42 +00:00
Cassie Han
a600b31201 Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents." am: eb9452a08d am: 8e3dcbb5d3 
am: b828fa2bfc

Change-Id: I086a958cab93dcbc47103e5d0c7d91dba5aab412
 2018-01-24 09:37:29 +00:00
Nicolas Geoffray
5c9dcc0e72 Revert "Add getUiccSlots() and switchSlots() in TelephonyManager." 
AOSP build broken.

Bug: 71914112

This reverts commit 2f87d7b2ee.

Change-Id: I53537a6da7616fe6dbbb79927b32720bbeaf1f69
 2018-01-24 09:11:40 +00:00