Commit Graph

344910 Commits

Author SHA1 Message Date
Lorenzo Colitti
333eb0ee46 Unbreak frameworks-net tests broken by missing libutilscallstack. am: f7fab104f9
am: df4aba36b4

Change-Id: I904ec7dee1f4f565a1db138e45c9e5497fbb2855
2018-01-23 19:36:02 +00:00
Lorenzo Colitti
2d1c6405d6 Disable IpConnectivityMetricsTest. am: b7a479c293
am: afb4ba1c35

Change-Id: Ic5a24e40ce126bc872281bb353706a245eb345f2
2018-01-23 19:33:27 +00:00
Lorenzo Colitti
5d50149710 Add the defaultNetwork element to the netstats.proto. am: 9781f785bc
am: adcb94472a

Change-Id: I292e903617d3af1867529e68eb20538afb66f665
2018-01-23 19:30:57 +00:00
Lorenzo Colitti
424fbdbd1e Add getDefaultNetwork to the NetworkStats public API. am: d5876bc438
am: 66eab17abc

Change-Id: If0aa0a4522df0061645d34cb3af8a33f288ed46d
2018-01-23 19:28:14 +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
Badhri Jagan Sridharan
26668b9056 Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL" am: bf996dd479 -s ours
am: 5400d4dc4f

Change-Id: I4eab9733b7bf766f559c2423f534bc5d9b1a1066
2018-01-23 18:45:03 +00:00
Badhri Jagan Sridharan
5400d4dc4f Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL"
am: bf996dd479  -s ours

Change-Id: I174f0a10e4ecb76607ed5e92e60ebf3a9523e6d9
2018-01-23 18:36:01 +00:00
Lorenzo Colitti
f7fab104f9 Unbreak frameworks-net tests broken by missing libutilscallstack.
Test: atest FrameworksNetTest shows fewer failures
Change-Id: Ic6f2bc18e80d91226d8d49e047e3997ffc45e45a
Merged-In: Ic6f2bc18e80d91226d8d49e047e3997ffc45e45a
2018-01-23 18:38:48 +09:00
Lorenzo Colitti
b7a479c293 Disable IpConnectivityMetricsTest.
This test has been failing for a while, and we are do not have
bandwidth to fix it during the next week.

Test: make -j64 FrameworksNetTests RUN_ERROR_PRONE=true
Test: atest FrameworksNetTests:IpConnectivityMetricsTest
Test: runtest -x frameworks/base/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java
Change-Id: I59d73c1773e160a726996f3ab4ad20312decc127
Merged-In: I59d73c1773e160a726996f3ab4ad20312decc127
2018-01-23 18:38:48 +09:00
Lorenzo Colitti
9781f785bc Add the defaultNetwork element to the netstats.proto.
This is in its own commit because AOSP has diverged from internal
master.

Bug: 35142602
Test: builds, boots
Change-Id: I75fc85b961bc919e3d6c2adce6d6861c6f2c8379
Merged-In: I75fc85b961bc919e3d6c2adce6d6861c6f2c8379
2018-01-23 18:38:48 +09:00
Lorenzo Colitti
d5876bc438 Add getDefaultNetwork to the NetworkStats public API.
This allows an app using the public API to know whether the
traffic in a particular bucket was on the default network
(i.e., the network was selected by the system), or not (i.e.,
the network was selected by the app).

Bug: 35142602
Test: builds, boots
Test: added coverage to NetworkUsageStatsTest CTS test, still passes
Change-Id: I9f6669908fa119743b9c0aa0c31a03e5ebafa7db
Merged-In: I9f6669908fa119743b9c0aa0c31a03e5ebafa7db
2018-01-23 18:28:07 +09:00
Badhri Jagan Sridharan
bf996dd479 Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL" 2018-01-23 03:09:27 +00:00
Yin-Chia Yeh
75774be569 Merge "Camera: remove NOT_PRESENT cameras" am: 174df238ac
am: 0e32a62cd4

Change-Id: I5b2d1d756daf1fabd8d42b9161de6a63d8989302
2018-01-23 02:35:28 +00:00
Lorenzo Colitti
cbbed8ee1f Merge "Remove obsolete NetworkStats.Entry constructor." am: 1683b6968d
am: cdeb50aa48

Change-Id: If60b58f95707bab3ae89050234226d54386398e8
2018-01-23 02:23:32 +00:00
Yin-Chia Yeh
0e32a62cd4 Merge "Camera: remove NOT_PRESENT cameras"
am: 174df238ac

Change-Id: I2c0dd5ccd8c8a165b568563051ad42dba6082792
2018-01-23 02:12:57 +00:00
Lorenzo Colitti
cdeb50aa48 Merge "Remove obsolete NetworkStats.Entry constructor."
am: 1683b6968d

Change-Id: I72fe99d5e662a6a154f7b2d970c5926ee696e541
2018-01-23 02:08:18 +00:00
Qingxi Li
54438137c6 Merge "Add broadcast action for carrier setup" am: b60e42becd
am: d6d448f68b

Change-Id: I085b0d23182696ba6ec639e1f48ec14ed010fecd
2018-01-23 01:25:35 +00:00
Qingxi Li
d6d448f68b Merge "Add broadcast action for carrier setup"
am: b60e42becd

Change-Id: I3bcde10528fc1fa722995e7666ee6faa7db1d0cd
2018-01-23 01:12:50 +00:00
yuemingw
aa32802268 Merge "Add NetworkTypeBitmask into public ApnSetting." am: 278dd4ab90
am: 97104cb905

Change-Id: Ibef74c641596dc57d8a525316ba95ff35e07fce2
2018-01-23 01:07:24 +00:00
Chen Xu
5871db10a5 Merge "address carrier id api review feedback" am: 2f6b2726e6
am: e6211a5f01

Change-Id: I3e601111b7da73158cf1ce281abd77b6d5cfc68f
2018-01-23 01:02:36 +00:00
Badhri Jagan Sridharan
5eb97dcf50 Add support for UsbDeviceManager to talk to USB GADGET HAL
Till now, Init scripts(property tiggers) are used define the
operation that needs to be performed when a certain gadget
composition needs to be enabled. Based on the user preference,
usb service sets the sys.usb.config which triggers the
corresponding property triggers in init scripts and usbservice
polls on sys.usb.state to infer whether the property triggers
have completed executing.

This CL makes UsbHandler class abstract to make init scripts
based legacy implementation and HAL based implementation to
share the common logic. The legacy init script based logic is
implemented by UsbHandlerLegacy and HAL based logic is implemented
by UsbHandlerHal. The decision on which one to initialize is
made depending on whether the device has Gadget HAL impelemented.

Since HIDL supports asynch calbacks, usb state management is moved
to the message queue to avoid polling incase of HAL based
implementation.

To switch to a new configuration:
1. UsbService calls setCurrentUsbFunctions and queues
   MSG_SET_FUNCTIONS_TIMEOUT
2. If the  setCurrentUsbFunctionsCb arrives on time,
   then  MSG_SET_FUNCTIONS_TIMEOUT is cancelled and
   default functions are retried by queueing
   MSG_SET_DEFAULT_FUNCTIONS if SUCCESS is not signalled.
3. If MSG_SET_FUNCTIONS_TIMEOUT gets executed, then,
   default functions are retried by calling
   setEnabledFunctions(null, false, mUsbDataUnlocked);

Also, for HAL based implementation config_oemUsbModeOverride is no
longer needed as hal can take of enabling oem specific functions.

Bug: 63669128
Test: Tested usb gadget configuration for both cases:
1. When gadget hal is present
2. When gadget hal is not present
Change-Id: Ifcef464a0b97b265872696346a76162f8e84d6c0
2018-01-22 17:02:25 -08:00
Treehugger Robot
174df238ac Merge "Camera: remove NOT_PRESENT cameras" 2018-01-23 00:52:00 +00:00
yuemingw
97104cb905 Merge "Add NetworkTypeBitmask into public ApnSetting."
am: 278dd4ab90

Change-Id: I63be092c9f978cf0e0b029e6836d5f0b876831f6
2018-01-23 00:47:01 +00:00
Chen Xu
e6211a5f01 Merge "address carrier id api review feedback"
am: 2f6b2726e6

Change-Id: I40fb765e4c4eb844826ae8e305ddcc7ef1c281f4
2018-01-23 00:42:06 +00:00
Lorenzo Colitti
1683b6968d Merge "Remove obsolete NetworkStats.Entry constructor." 2018-01-23 00:15:15 +00:00
Benedict Wong
08307475a2 Merge "Address comments and final cleanup from refcounting integration" am: 222529d95c
am: 8130c2a718

Change-Id: I7ed4a6bb90f3cf3ed5fd0e6ad20b033e588a4c90
2018-01-23 00:08:17 +00:00
Benedict Wong
8130c2a718 Merge "Address comments and final cleanup from refcounting integration"
am: 222529d95c

Change-Id: Ie0bc2b81e09ee874ef848905bb486967a857c6d1
2018-01-22 23:57:28 +00:00
Treehugger Robot
b60e42becd Merge "Add broadcast action for carrier setup" 2018-01-22 23:55:49 +00:00
Treehugger Robot
278dd4ab90 Merge "Add NetworkTypeBitmask into public ApnSetting." 2018-01-22 22:53:38 +00:00
Chen Xu
2f6b2726e6 Merge "address carrier id api review feedback" 2018-01-22 22:44:02 +00:00
Qingxi Li
a5dcdb4dc4 Add broadcast action for carrier setup
This broadcast action is sent by eSIM Manager to let the carrier app
know that the carrier setup is not completed.

Bug: 62639823
Test: TreeHugger
Merged-In: I88ac90cf679d5ec98aa7c0cf7bd9c96010597a1c
Change-Id: I88ac90cf679d5ec98aa7c0cf7bd9c96010597a1c
2018-01-22 14:03:40 -08:00
fionaxu
ac1defabc8 address carrier id api review feedback
1. improve comments
2. change returned carrier name from String to CharSequence
3. change to AndroidCarrierId

Bug: 64131637
Bug: 71584605
Test: Manual
Change-Id: I412d53bb9d4955e1267300692e90ebfffd6818df
Merged-in: I412d53bb9d4955e1267300692e90ebfffd6818df
2018-01-22 21:05:55 +00:00
Benedict Wong
222529d95c Merge "Address comments and final cleanup from refcounting integration" 2018-01-22 20:32:18 +00:00
Andreas Gampe
03eb67c287 Merge "Debug: Add attachJvmtiAgent with classloader" am: 940c0341f0
am: 878abd8e91

Change-Id: I862a822ef7600030f7b435fe9b9368961cf4694b
2018-01-22 20:01:18 +00:00
Benedict Wong
5b3e788908 Merge "Rename create/delete transform methods" am: 7ee26e72cf
am: 5b71c4a0a5

Change-Id: I16bfb511ac2d6094e246f79d51fe4520d3e765cd
2018-01-22 19:53:15 +00:00
Andreas Gampe
878abd8e91 Merge "Debug: Add attachJvmtiAgent with classloader"
am: 940c0341f0

Change-Id: I0c9179b373040e7d4f54a5ad9835d14624012999
2018-01-22 19:48:28 +00:00
Benedict Wong
5b71c4a0a5 Merge "Rename create/delete transform methods"
am: 7ee26e72cf

Change-Id: I76576d1f3193fcbb3680fb29893cf696ea7a41fe
2018-01-22 19:44:43 +00:00
Treehugger Robot
940c0341f0 Merge "Debug: Add attachJvmtiAgent with classloader" 2018-01-22 18:22:07 +00:00
Benedict Wong
7ee26e72cf Merge "Rename create/delete transform methods" 2018-01-22 17:57:15 +00:00
yuemingw
84323c0dce Add NetworkTypeBitmask into public ApnSetting.
Sync with aosp/556766.
Moved from ag/3477310.

Bug: 68208293
Test: manual
Change-Id: I04b901c46b7bbce4ed7d52895fcc904fb713fb69
2018-01-22 17:35:26 +00:00
Lorenzo Colitti
1e507e6178 Remove obsolete NetworkStats.Entry constructor.
The only caller is telephony code, and it's being fixed in this
topic.

Bug: 35142602
Test: builds, boots
Change-Id: Ia77a1c2c297037f311c2355610c206cd8e3192c4
2018-01-21 23:01:35 +09:00
Pavlin Radoslavov
65ff8a65b6 Merge "Multi-A2DP support - add a new internal API to suppress Audio Noisy intent" am: 7e3b1832c4
am: 5bd12d0bf4

Change-Id: I52b1adc5ce9f3dea56b0045581d7736cbe62de73
2018-01-21 00:33:40 +00:00
Pavlin Radoslavov
5bd12d0bf4 Merge "Multi-A2DP support - add a new internal API to suppress Audio Noisy intent"
am: 7e3b1832c4

Change-Id: I4b75e8565dc0b80d6ca3825e87370a72c726bd25
2018-01-21 00:26:11 +00:00
Treehugger Robot
7e3b1832c4 Merge "Multi-A2DP support - add a new internal API to suppress Audio Noisy intent" 2018-01-20 23:30:34 +00:00
Pavlin Radoslavov
be4fb893a0 Multi-A2DP support - add a new internal API to suppress Audio Noisy intent
The new API setBluetoothA2dpDeviceConnectionStateSuppressNoisyIntent()
is similar to the existing setBluetoothA2dpDeviceConnectionState()
except that it takes one extra argument that indicates whether the
AudioManager.ACTION_AUDIO_BECOMING_NOISY intent will be sent:

  setBluetoothA2dpDeviceConnectionStateSuppressNoisyIntent(
      ..., boolean suppressNoisyIntent)

This API is needed so the Active A2DP Sink device can be changed
while audio is streaming, and the audio continues playing on the new
Active Device.

Bug: 69269748
Test: Manual: multiple connected A2DP devices, and selecting each as
      the Active Device.

Change-Id: I75766a58d9e6b42b3ce68bd9ad3a7a72ca5a1023
(cherry picked from commit 82e06463f2)
2018-01-20 11:50:37 -08:00
David Brazdil
ccc31988ee Merge "Generate new API signatures from doclava" am: fa208b4226
am: 72b7f03179

Change-Id: I7dbf94c493bc79f4200afc45e6ed58543359c9ff
2018-01-20 11:33:16 +00:00
David Brazdil
72b7f03179 Merge "Generate new API signatures from doclava"
am: fa208b4226

Change-Id: Iae4cc67435b84c868a446dc7ac16a618656bbdbb
2018-01-20 11:23:49 +00:00