Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
343,927 Commits 3 Branches 0 Tags
a8505da2a6f9906bc2ce3a35058522bc552bbbef
Commit Graph

343927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack He
a8505da2a6 Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP" 
am: 0aafefb113

Change-Id: I3cb4f7ecbdafaccb40c9e9c7f791d4786583bd56
 2018-01-24 19:42:36 +00:00
Treehugger Robot
0aafefb113 Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP" 2018-01-24 18:03:21 +00:00
Eric Schwarzenbach
3deaafd8cd Merge "Add PhysicalChannelConfig." 
am: c584d2772d

Change-Id: I3377d0502e74e58aed9f2cba746993130a4469dd
 2018-01-24 16:40:14 +00:00
Jack He
8dd33941a4 BT-HFP: Update Bluetooth headset state handler to Multi-HFP 
* When multiple headset devices are connected at the same time, at most one
  device can be used for SCO audio at any time. This device is called
  Active Device and is indicated by either
  BluetoothHeadset.getActiveDevice() or
  BluetoothHeadset.ACTIVE_DEVICE_CHANGED intent. It can also be set
  through BluetoothHeadset.setActiveDevice(BluetoothDevice) internal API.
* This change let AudioService to listen to ACTIVE_DEVICE_CHANGED intent
  instead of CONNECTION_STATE_CHANGED intent since it is the active
  device that AudioService cares about, not the list of connected
  devices.
* Everytime a new active device is set, AudioService will treat the old
  one (if not null) as disconnected and call disconnection methods in
  audio framework and the new active device is regarded as newly
  connected and connection methods will be called by AudioService.
* When disconnectHeadset() is called, active device will be set to null

Bug: 71875419
Test: compile, connect multiple HFP devices and switch active device
      among them
Change-Id: I148cca079d36a2dfc6a46b8d42ba69821c9c6de3
 2018-01-24 16:27:15 +00:00
Eric Schwarzenbach
c584d2772d Merge "Add PhysicalChannelConfig." 2018-01-24 16:17:53 +00:00
Nicolas Geoffray
b91d1b3e3a Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" 
am: 1f568c14ac

Change-Id: I49a375508824696b3f362bce720a296d85a084aa
 2018-01-24 12:25:10 +00:00
Benoit Lamarche
05bb83c87d Merge "Fail when there is an ASM error" 
am: 4152497b4b

Change-Id: Ic5ca952591fa235c7e4a28d95d9b1cb1d4644f8a
 2018-01-24 12:21:23 +00:00
Nicolas Geoffray
1f568c14ac Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" 2018-01-24 10:44:10 +00:00
Benoit Lamarche
4152497b4b Merge "Fail when there is an ASM error" 2018-01-24 09:59:28 +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
Benedict Wong
e1aa92f1c1 Merge "Add TunnelInterface API and KernelResourceRecords" 
am: f811dff3bc

Change-Id: Ic8a93b2d6d8280c01808968251e6f422fa1d2340
 2018-01-24 08:55:38 +00:00
Benedict Wong
4077e802ad Merge "Add xfrm mark in IpSecConfig" 
am: 73f79ceae9

Change-Id: Idcac0878b4f74c25ef007fb7f1643fca5de80225
 2018-01-24 08:00:52 +00:00
Holly Jiuyu Sun
5598f5ab23 Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." 
am: 8fd5b7e1c3

Change-Id: Ia822753db39db9b383e8e987049ec4a0738ac27b
 2018-01-24 07:48:48 +00:00
Benedict Wong
f811dff3bc Merge "Add TunnelInterface API and KernelResourceRecords" 2018-01-24 07:25:04 +00:00
Benedict Wong
8149f6eb6c Add TunnelInterface API and KernelResourceRecords 
This change adds one KernelResourceRecord type (TunnelInterfaceRecord),
and adds methods for the creation of TunnelInterfaces, as well as the
application of Transforms to the given TunnelInterfaces

As part of the generation of ikeys/okeys, a ReserveKeyTracker manages a
java bitset to avoid collisions and reserve/release keys.

Bug: 63588681
Test: Compiles, CTS, unit tests all pass on AOSP_marlin
Change-Id: I9e9b6455e27073acd4491eae666aa966b3b10e0f
 2018-01-24 07:24:27 +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
8e3dcbb5d3 Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents." 
am: eb9452a08d

Change-Id: Iaa4e291d0926db9ddb8123a7ec72acf1e82c4d84
 2018-01-24 06:06:59 +00:00
Chalard Jean
84af3a7b2b Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ... 
am: 6568170b32

Change-Id: I49269ac65138be59d68561ea1c15ff2ad0339d8b
 2018-01-24 06:03:41 +00:00
Benedict Wong
73f79ceae9 Merge "Add xfrm mark in IpSecConfig" 2018-01-24 05:53:29 +00:00
Chenbo Feng
e041f38289 Merge changes from topic "bpfStats" 
am: 6e03224697

Change-Id: I488be110cca66990f44f6e45d5489ce23f36432e
 2018-01-24 05:32:34 +00:00
Holly Jiuyu Sun
50b8d3ef75 Merge "Add cardId in EuiccCardManager API." 
am: a85291bfcf

Change-Id: I583cb9bb3673b197331a032510c1949edf3dcf9c
 2018-01-24 05:25:49 +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
Chalard Jean
6568170b32 Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ... 
* changes:
  Let network requests see VPNs.
  Move constants into a new file.
  Make sure listen requests from VPN apps see their own networks
  Add a test for new UID checking code.
  Remove UID_RANGES_ADDED and REMOVED.
  Move VPN allowed UIDs into NetworkCapabilities.
  Pre-import to remove a conflict.
 2018-01-24 04:09:44 +00:00
Treehugger Robot
6e03224697 Merge changes from topic "bpfStats" 
* changes:
  Use /proc/net/dev to get stats summary
  Add bpf support for NetworkStatsFactory
  Add BPF support for NetworkStatsService
 2018-01-24 04:08:29 +00:00
Holly Jiuyu Sun
a85291bfcf Merge "Add cardId in EuiccCardManager API." 2018-01-24 04:06:40 +00:00
Benedict Wong
c2253ff48d Merge "Expose applyTunnelModeTransform as a system API" 
am: d056f32bd9

Change-Id: Ibebf4d53bc6b22cb32a23720f0b09e24de5e704b
 2018-01-24 02:43:49 +00:00
Holly Jiuyu Sun
24ba89dafe Merge "Make getIEuiccContronller() protected and non-static for CTS." 
am: 2378a2ca0b

Change-Id: If8d1bc3db4be3f2d7e79f9c508ea3db3197159e9
 2018-01-24 02:14:31 +00:00
Benedict Wong
d056f32bd9 Merge "Expose applyTunnelModeTransform as a system API" 2018-01-24 01:42:30 +00:00
Xiangyu/Malcolm Chen
dae9a8e839 Merge "Add TransportType in AccessNetworkConstants.java" 
am: afd65d9d1c

Change-Id: Ie0ef55c0a3e75937a0e68b364bf6e202ad0678bd
 2018-01-24 01:12:24 +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
2621c9f6ad Merge changes from topic "signal-strength-cleanup" 
am: fb24180fe0

Change-Id: Iad22d4d91032a87877994bfca00c4f80d11f66c0
 2018-01-24 00:58:38 +00:00
Nathan Harold
02f4ec2eed Cleanup SignalStrength Parcel 
am: 9becf4b334

Change-Id: I44e6b2187bbcb2334adb40be5d438f581d9638bb
 2018-01-24 00:54:13 +00:00
Xiangyu/Malcolm Chen
afd65d9d1c Merge "Add TransportType in AccessNetworkConstants.java" 2018-01-23 23:39:10 +00:00
Holly Jiuyu Sun
2f87d7b2ee Add getUiccSlots() and switchSlots() in TelephonyManager. 
Bug: 71914112
Test: test on phone
Change-Id: Ib7e9e40e5ecda48bdcd1f332dc7d6c422c08d942
 2018-01-23 15:26:34 -08:00
Benedict Wong
e0d448f31e Expose applyTunnelModeTransform as a system API 
Simple change to expose systemAPI for applyTunnelModeTransform

Bug: 36033193
Test: All CTS, unit tests passing
Change-Id: I2d857c048bc0dc80c3949387f946b1f5adf0527e
 2018-01-23 23:25:54 +00:00
nharold
fb24180fe0 Merge changes from topic "signal-strength-cleanup" 
* changes:
  Fix getAsuLevel returns "99" in Lte and TdScdma.
  Cleanup SignalStrength Parcel
 2018-01-23 23:23:48 +00:00
Cassie
866f494dc2 Move android.provider.Telephony.SECRET_CODE to Telephony.Intents. 
Bug: 69616728
Test: Basic telephony sanity
Change-Id: Ia053f9be082ceb139a284598ee2398a25daa7e08
 2018-01-23 15:06:53 -08:00
Jack Yu
28f64b869c Merge "Combined flags of data service requests into one reason param" 
am: 7d441c9b27

Change-Id: I6e8069639e5d7d57fde69747fb78d044e625680e
 2018-01-23 21:46:18 +00:00
Robert Sesek
cb7119385e Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID." 
am: 572f65fb58

Change-Id: I822fdad1c22de97884e389f651230ef31cd65deb
 2018-01-23 21:42:19 +00:00
Treehugger Robot
7d441c9b27 Merge "Combined flags of data service requests into one reason param" 2018-01-23 19:43:25 +00:00
Benedict Wong
1a2e3f3b54 Merge "Add checks to ensure SPIs are not reused" 
am: 0a1dd194aa

Change-Id: I893925014557e5ae13303debc4ee8f50faf9605d
 2018-01-23 19:27:51 +00:00
Amit Mahajan
40effae0f3 Merge "Added new slot status related broadcast." 
am: cdc0a084d1

Change-Id: Ia81c5648a943bf1c13b1434b40dd09c6789a6576
 2018-01-23 19:24:04 +00:00
Lorenzo Colitti
c46c21c702 Merge changes from topic "multipath-datausage-backport" 
am: df984fae26

Change-Id: Ic29d71ade161434b6dea796a887f60b5587ca1d5
 2018-01-23 19:17:54 +00:00
Lorenzo Colitti
e383807d7f Add metered, roaming, and defaultNetwork info to NetworkTemplate. 
am: 0f9bce6883

Change-Id: I28e7f539fc5e0698cb8ef663aafae7a2cd579d68
 2018-01-23 19:13:30 +00:00
Lorenzo Colitti
df4aba36b4 Unbreak frameworks-net tests broken by missing libutilscallstack. 
am: f7fab104f9

Change-Id: I3125e9276da6cbbae5ef490cf98583b31c4ad8d2
 2018-01-23 19:09:07 +00:00
Lorenzo Colitti
afb4ba1c35 Disable IpConnectivityMetricsTest. 
am: b7a479c293

Change-Id: Iba9dad4001c6aa725285eee6df32f116c846532d
 2018-01-23 19:04:05 +00:00
Lorenzo Colitti
adcb94472a Add the defaultNetwork element to the netstats.proto. 
am: 9781f785bc

Change-Id: I725132a756baacbc42c573274f5687cf58225498
 2018-01-23 18:57:44 +00:00
Lorenzo Colitti
66eab17abc Add getDefaultNetwork to the NetworkStats public API. 
am: d5876bc438

Change-Id: Ifbe3d8ede39c87d64eee20adcfbdd92479d09e69
 2018-01-23 18:50:20 +00:00