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

5595 Commits

Author SHA1 Message Date
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
Treehugger Robot
27bb333e14 Merge "Adds stripTrailingFs" 2018-01-25 02:44:26 +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
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
Holly Jiuyu Sun
687a28d77d Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." am: 8fd5b7e1c3 
am: 5598f5ab23

Change-Id: Ib79c5a2d05c09c8a36dd2e761719f37520735c00
 2018-01-24 08:10:38 +00:00
Eric Schwarzenbach
5c6b3a3557 Add PhysicalChannelConfig. 
Adds a field to PhoneStateListener to listen for changes to the
PhysicalChannelConfig list.

Bug: 72117533
Test: make
Change-Id: I353a4b90354d54948bce75968fb5fe1803efd093
 2018-01-23 23:08:56 -08:00
Cassie Han
b828fa2bfc Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents." am: eb9452a08d 
am: 8e3dcbb5d3

Change-Id: Iacd500459bb8418d41bae56131ecdac0ac6471bd
 2018-01-24 06:17:42 +00:00
Holly Jiuyu Sun
48c6e980f5 Merge "Add cardId in EuiccCardManager API." am: a85291bfcf am: 50b8d3ef75 
am: 9d5d23b69a

Change-Id: Ie922ef52b4fb5b6ee95bb5976b16d5f54d9b43a1
 2018-01-24 05:39:57 +00:00
Holly Jiuyu Sun
9d5d23b69a Merge "Add cardId in EuiccCardManager API." am: a85291bfcf 
am: 50b8d3ef75

Change-Id: I7fdb6666728bfa31405d23c5880dba2c63a89e41
 2018-01-24 05:33:02 +00:00
Holly Jiuyu Sun
8fd5b7e1c3 Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." 2018-01-24 05:08:19 +00:00
Cassie Han
eb9452a08d Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents." 2018-01-24 04:55:32 +00:00
Holly Jiuyu Sun
a85291bfcf Merge "Add cardId in EuiccCardManager API." 2018-01-24 04:06:40 +00:00
Holly Jiuyu Sun
e3ff07125c Merge "Make getIEuiccContronller() protected and non-static for CTS." am: 2378a2ca0b am: 24ba89dafe 
am: 083022a701

Change-Id: I130b3e8aef6c45e5931d838a3dfd2817dcb7afe8
 2018-01-24 02:29:45 +00:00
Holly Jiuyu Sun
083022a701 Merge "Make getIEuiccContronller() protected and non-static for CTS." am: 2378a2ca0b 
am: 24ba89dafe

Change-Id: Ia5313c8daab24242ae4a00bfdc23eb4f23634558
 2018-01-24 02:21:14 +00:00
Xiangyu/Malcolm Chen
592ae5cb9f Merge "Add TransportType in AccessNetworkConstants.java" am: afd65d9d1c am: dae9a8e839 
am: c240b8c25f

Change-Id: Ie866867f99c8699703b6d12d0af78fbff5d5f59b
 2018-01-24 01:36:58 +00:00
Xiangyu/Malcolm Chen
c240b8c25f Merge "Add TransportType in AccessNetworkConstants.java" am: afd65d9d1c 
am: dae9a8e839

Change-Id: I593635999bdfa290b012313d9967bddfc5e7bfe1
 2018-01-24 01:23:32 +00:00
nharold
277ff08723 Merge changes from topic "signal-strength-cleanup" am: fb24180fe0 am: 2621c9f6ad 
am: d5c9522b43

Change-Id: I8c30c1401e97adcb026a25607a737bd336685807
 2018-01-24 01:19:36 +00:00
Nathan Harold
1b274d9365 Cleanup SignalStrength Parcel am: 9becf4b334 am: 02f4ec2eed 
am: a644d93ec9

Change-Id: Id3abf1f4c2f1faaef6dd44e702590f157fcac7d2
 2018-01-24 01:15:14 +00:00
Holly Jiuyu Sun
c2779f56fb Add cardId in EuiccCardManager API. 
Removed getEid() API.

Bug: 38206971
Test: test on phone
Change-Id: I7e484f889a780900acd3a05a96fbbc632e1ec682
 2018-01-23 17:11:30 -08:00
Holly Jiuyu Sun
2378a2ca0b Merge "Make getIEuiccContronller() protected and non-static for CTS." 2018-01-24 01:09:44 +00:00
nharold
d5c9522b43 Merge changes from topic "signal-strength-cleanup" am: fb24180fe0 
am: 2621c9f6ad

Change-Id: I30b5deb01ed68dc0e235e9997fa147aadb924749
 2018-01-24 01:08:33 +00:00
Nathan Harold
a644d93ec9 Cleanup SignalStrength Parcel am: 9becf4b334 
am: 02f4ec2eed

Change-Id: I9e862b15ab4b5871d9d7e00af86ab9049b5b7b50
 2018-01-24 01:05:07 +00:00
Nathan Harold
02f4ec2eed Cleanup SignalStrength Parcel 
am: 9becf4b334

Change-Id: I44e6b2187bbcb2334adb40be5d438f581d9638bb
 2018-01-24 00:54:13 +00:00