OSDN Git Service
Eric Schwarzenbach [Wed, 24 Jan 2018 16:40:14 +0000 (16:40 +0000)]
Merge "Add PhysicalChannelConfig."
am:
c584d2772d
Change-Id: I3377d0502e74e58aed9f2cba746993130a4469dd
Eric Schwarzenbach [Wed, 24 Jan 2018 16:17:53 +0000 (16:17 +0000)]
Merge "Add PhysicalChannelConfig."
Nicolas Geoffray [Wed, 24 Jan 2018 12:25:10 +0000 (12:25 +0000)]
Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""
am:
1f568c14ac
Change-Id: I49a375508824696b3f362bce720a296d85a084aa
Benoit Lamarche [Wed, 24 Jan 2018 12:21:23 +0000 (12:21 +0000)]
Merge "Fail when there is an ASM error"
am:
4152497b4b
Change-Id: Ic5ca952591fa235c7e4a28d95d9b1cb1d4644f8a
Nicolas Geoffray [Wed, 24 Jan 2018 10:44:10 +0000 (10:44 +0000)]
Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""
Benoit Lamarche [Wed, 24 Jan 2018 09:59:28 +0000 (09:59 +0000)]
Merge "Fail when there is an ASM error"
Nicolas Geoffray [Wed, 24 Jan 2018 09:11:40 +0000 (09:11 +0000)]
Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."
AOSP build broken.
Bug:
71914112
This reverts commit
2f87d7b2ee5097eae4e2a62858fbe221dac857f6.
Change-Id: I53537a6da7616fe6dbbb79927b32720bbeaf1f69
Benedict Wong [Wed, 24 Jan 2018 08:55:38 +0000 (08:55 +0000)]
Merge "Add TunnelInterface API and KernelResourceRecords"
am:
f811dff3bc
Change-Id: Ic8a93b2d6d8280c01808968251e6f422fa1d2340
Benedict Wong [Wed, 24 Jan 2018 08:00:52 +0000 (08:00 +0000)]
Merge "Add xfrm mark in IpSecConfig"
am:
73f79ceae9
Change-Id: Idcac0878b4f74c25ef007fb7f1643fca5de80225
Holly Jiuyu Sun [Wed, 24 Jan 2018 07:48:48 +0000 (07:48 +0000)]
Merge "Add getUiccSlots() and switchSlots() in TelephonyManager."
am:
8fd5b7e1c3
Change-Id: Ia822753db39db9b383e8e987049ec4a0738ac27b
Benedict Wong [Wed, 24 Jan 2018 07:25:04 +0000 (07:25 +0000)]
Merge "Add TunnelInterface API and KernelResourceRecords"
Benedict Wong [Fri, 19 Jan 2018 02:31:45 +0000 (18:31 -0800)]
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
Eric Schwarzenbach [Fri, 19 Jan 2018 01:15:51 +0000 (17:15 -0800)]
Add PhysicalChannelConfig.
Adds a field to PhoneStateListener to listen for changes to the
PhysicalChannelConfig list.
Bug:
72117533
Test: make
Change-Id: I353a4b90354d54948bce75968fb5fe1803efd093
Cassie Han [Wed, 24 Jan 2018 06:06:59 +0000 (06:06 +0000)]
Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents."
am:
eb9452a08d
Change-Id: Iaa4e291d0926db9ddb8123a7ec72acf1e82c4d84
Chalard Jean [Wed, 24 Jan 2018 06:03:41 +0000 (06:03 +0000)]
Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ...
am:
6568170b32
Change-Id: I49269ac65138be59d68561ea1c15ff2ad0339d8b
Benedict Wong [Wed, 24 Jan 2018 05:53:29 +0000 (05:53 +0000)]
Merge "Add xfrm mark in IpSecConfig"
Chenbo Feng [Wed, 24 Jan 2018 05:32:34 +0000 (05:32 +0000)]
Merge changes from topic "bpfStats"
am:
6e03224697
Change-Id: I488be110cca66990f44f6e45d5489ce23f36432e
Holly Jiuyu Sun [Wed, 24 Jan 2018 05:25:49 +0000 (05:25 +0000)]
Merge "Add cardId in EuiccCardManager API."
am:
a85291bfcf
Change-Id: I583cb9bb3673b197331a032510c1949edf3dcf9c
Holly Jiuyu Sun [Wed, 24 Jan 2018 05:08:19 +0000 (05:08 +0000)]
Merge "Add getUiccSlots() and switchSlots() in TelephonyManager."
Cassie Han [Wed, 24 Jan 2018 04:55:32 +0000 (04:55 +0000)]
Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents."
Chalard Jean [Wed, 24 Jan 2018 04:09:44 +0000 (04:09 +0000)]
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.
Treehugger Robot [Wed, 24 Jan 2018 04:08:29 +0000 (04:08 +0000)]
Merge changes from topic "bpfStats"
* changes:
Use /proc/net/dev to get stats summary
Add bpf support for NetworkStatsFactory
Add BPF support for NetworkStatsService
Holly Jiuyu Sun [Wed, 24 Jan 2018 04:06:40 +0000 (04:06 +0000)]
Merge "Add cardId in EuiccCardManager API."
Benedict Wong [Wed, 24 Jan 2018 02:43:49 +0000 (02:43 +0000)]
Merge "Expose applyTunnelModeTransform as a system API"
am:
d056f32bd9
Change-Id: Ibebf4d53bc6b22cb32a23720f0b09e24de5e704b
Holly Jiuyu Sun [Wed, 24 Jan 2018 02:14:31 +0000 (02:14 +0000)]
Merge "Make getIEuiccContronller() protected and non-static for CTS."
am:
2378a2ca0b
Change-Id: If8d1bc3db4be3f2d7e79f9c508ea3db3197159e9
Benedict Wong [Wed, 24 Jan 2018 01:42:30 +0000 (01:42 +0000)]
Merge "Expose applyTunnelModeTransform as a system API"
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 01:12:24 +0000 (01:12 +0000)]
Merge "Add TransportType in AccessNetworkConstants.java"
am:
afd65d9d1c
Change-Id: Ie0ef55c0a3e75937a0e68b364bf6e202ad0678bd
Holly Jiuyu Sun [Wed, 24 Jan 2018 00:49:22 +0000 (16:49 -0800)]
Add cardId in EuiccCardManager API.
Removed getEid() API.
Bug:
38206971
Test: test on phone
Change-Id: I7e484f889a780900acd3a05a96fbbc632e1ec682
Holly Jiuyu Sun [Wed, 24 Jan 2018 01:09:44 +0000 (01:09 +0000)]
Merge "Make getIEuiccContronller() protected and non-static for CTS."
nharold [Wed, 24 Jan 2018 00:58:38 +0000 (00:58 +0000)]
Merge changes from topic "signal-strength-cleanup"
am:
fb24180fe0
Change-Id: Iad22d4d91032a87877994bfca00c4f80d11f66c0
Nathan Harold [Wed, 24 Jan 2018 00:54:13 +0000 (00:54 +0000)]
Cleanup SignalStrength Parcel
am:
9becf4b334
Change-Id: I44e6b2187bbcb2334adb40be5d438f581d9638bb
Xiangyu/Malcolm Chen [Tue, 23 Jan 2018 23:39:10 +0000 (23:39 +0000)]
Merge "Add TransportType in AccessNetworkConstants.java"
Holly Jiuyu Sun [Fri, 12 Jan 2018 02:47:04 +0000 (18:47 -0800)]
Add getUiccSlots() and switchSlots() in TelephonyManager.
Bug:
71914112
Test: test on phone
Change-Id: Ib7e9e40e5ecda48bdcd1f332dc7d6c422c08d942
Benedict Wong [Tue, 23 Jan 2018 19:01:28 +0000 (11:01 -0800)]
Expose applyTunnelModeTransform as a system API
Simple change to expose systemAPI for applyTunnelModeTransform
Bug:
36033193
Test: All CTS, unit tests passing
Change-Id: I2d857c048bc0dc80c3949387f946b1f5adf0527e
nharold [Tue, 23 Jan 2018 23:23:48 +0000 (23:23 +0000)]
Merge changes from topic "signal-strength-cleanup"
* changes:
Fix getAsuLevel returns "99" in Lte and TdScdma.
Cleanup SignalStrength Parcel
Cassie [Sat, 20 Jan 2018 01:23:36 +0000 (17:23 -0800)]
Move android.provider.Telephony.SECRET_CODE to Telephony.Intents.
Bug:
69616728
Test: Basic telephony sanity
Change-Id: Ia053f9be082ceb139a284598ee2398a25daa7e08
Jack Yu [Tue, 23 Jan 2018 21:46:18 +0000 (21:46 +0000)]
Merge "Combined flags of data service requests into one reason param"
am:
7d441c9b27
Change-Id: I6e8069639e5d7d57fde69747fb78d044e625680e
Robert Sesek [Tue, 23 Jan 2018 21:42:19 +0000 (21:42 +0000)]
Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID."
am:
572f65fb58
Change-Id: I822fdad1c22de97884e389f651230ef31cd65deb
Treehugger Robot [Tue, 23 Jan 2018 19:43:25 +0000 (19:43 +0000)]
Merge "Combined flags of data service requests into one reason param"
Benedict Wong [Tue, 23 Jan 2018 19:27:51 +0000 (19:27 +0000)]
Merge "Add checks to ensure SPIs are not reused"
am:
0a1dd194aa
Change-Id: I893925014557e5ae13303debc4ee8f50faf9605d
Amit Mahajan [Tue, 23 Jan 2018 19:24:04 +0000 (19:24 +0000)]
Merge "Added new slot status related broadcast."
am:
cdc0a084d1
Change-Id: Ia81c5648a943bf1c13b1434b40dd09c6789a6576
Lorenzo Colitti [Tue, 23 Jan 2018 19:17:54 +0000 (19:17 +0000)]
Merge changes from topic "multipath-datausage-backport"
am:
df984fae26
Change-Id: Ic29d71ade161434b6dea796a887f60b5587ca1d5
Lorenzo Colitti [Tue, 23 Jan 2018 19:13:30 +0000 (19:13 +0000)]
Add metered, roaming, and defaultNetwork info to NetworkTemplate.
am:
0f9bce6883
Change-Id: I28e7f539fc5e0698cb8ef663aafae7a2cd579d68
Lorenzo Colitti [Tue, 23 Jan 2018 19:09:07 +0000 (19:09 +0000)]
Unbreak frameworks-net tests broken by missing libutilscallstack.
am:
f7fab104f9
Change-Id: I3125e9276da6cbbae5ef490cf98583b31c4ad8d2
Lorenzo Colitti [Tue, 23 Jan 2018 19:04:05 +0000 (19:04 +0000)]
Disable IpConnectivityMetricsTest.
am:
b7a479c293
Change-Id: Iba9dad4001c6aa725285eee6df32f116c846532d
Lorenzo Colitti [Tue, 23 Jan 2018 18:57:44 +0000 (18:57 +0000)]
Add the defaultNetwork element to the netstats.proto.
am:
9781f785bc
Change-Id: I725132a756baacbc42c573274f5687cf58225498
Lorenzo Colitti [Tue, 23 Jan 2018 18:50:20 +0000 (18:50 +0000)]
Add getDefaultNetwork to the NetworkStats public API.
am:
d5876bc438
Change-Id: Ifbe3d8ede39c87d64eee20adcfbdd92479d09e69
Badhri Jagan Sridharan [Tue, 23 Jan 2018 18:36:01 +0000 (18:36 +0000)]
Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL"
am:
bf996dd479 -s ours
Change-Id: I174f0a10e4ecb76607ed5e92e60ebf3a9523e6d9
Holly Jiuyu Sun [Fri, 19 Jan 2018 18:27:56 +0000 (10:27 -0800)]
Make getIEuiccContronller() protected and non-static for CTS.
Test: test on phone
Change-Id: I706a0a9e064a0f2f91674cb2ff38a5929eaaf627
yifan.bai [Fri, 20 Oct 2017 02:25:11 +0000 (10:25 +0800)]
Fix getAsuLevel returns "99" in Lte and TdScdma.
GetAsuLevel method judges valid signal by
getLteLevel/getTdScdmaLevel. However, level is
SIGNAL_STRENGTH_NONE_OR_UNKNOWN does not mean not in
Lte/TdScdma.
For example, if mLteRsrp is in (threshRsrp[1],
threshRsrp[0]], getLteLevel would return
SIGNAL_STRENGTH_NONE_OR_UNKNOWN. But this only
means Lte signal is very weak, and ASU should be
(mLteRsrp + 140) not "99" (3GPP 27.007 Sec 8.69).
Bug:
72116430
Test: Build
Change-Id: If930c3e3d23a9af7b2e51e3560cc28607a6328c0
Nathan Harold [Fri, 19 Jan 2018 00:45:40 +0000 (16:45 -0800)]
Cleanup SignalStrength Parcel
Clean up the SignalStrength parcel. This CL
removes redundant constructors, simplifies the
overall initialization process, and stratifies
the components of the parcel into 2 separate
parts: the strength values from RIL, and the
config values provided by the platform.
Bug:
72116430
Test: runtest frameworks-telephony
Change-Id: Id7d2339362270b3911e96094275e1e545d6b581c
Malcolm Chen [Tue, 23 Jan 2018 00:00:29 +0000 (16:00 -0800)]
Add TransportType in AccessNetworkConstants.java
Bug:
64132030
Test: build
Change-Id: I916a0b889110195d23b2a531308171cf4ea74f0c
Treehugger Robot [Tue, 23 Jan 2018 18:14:00 +0000 (18:14 +0000)]
Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID."
Benedict Wong [Tue, 23 Jan 2018 18:00:06 +0000 (18:00 +0000)]
Merge "Add checks to ensure SPIs are not reused"
Treehugger Robot [Tue, 23 Jan 2018 18:00:00 +0000 (18:00 +0000)]
Merge "Added new slot status related broadcast."
Lorenzo Colitti [Tue, 23 Jan 2018 15:22:18 +0000 (15:22 +0000)]
Merge changes from topic "multipath-datausage-backport"
* changes:
Support passing a template to NetworkStatsManager queries.
Add metered, roaming, and defaultNetwork info to NetworkTemplate.
Unbreak frameworks-net tests broken by missing libutilscallstack.
Disable IpConnectivityMetricsTest.
Add the defaultNetwork element to the netstats.proto.
Add getDefaultNetwork to the NetworkStats public API.
Chalard Jean [Wed, 10 Jan 2018 12:19:32 +0000 (21:19 +0900)]
Let network requests see VPNs.
Test: runtest frameworks-net
Test: also tested with VPN app
Test: also cts passing
Change-Id: I3b16caad7787c3c1f2921ca1583815c89efbadc5
Chalard Jean [Fri, 19 Jan 2018 08:00:47 +0000 (17:00 +0900)]
Move constants into a new file.
Also audit all constants, make some private, annotate some
with @VisibleForTesting.
Test: runtest framework && cts
Change-Id: Iaf5ea7abd36fd8d544dcc84654f6cb529196d654
Chalard Jean [Wed, 17 Jan 2018 06:10:05 +0000 (15:10 +0900)]
Make sure listen requests from VPN apps see their own networks
Test: runtest frameworks-net
Test: CTS pass, including with the next patch which is what this
actually matters for
Change-Id: I09a94042acbefa24ab884f95326e30d6ab280b82
Chalard Jean [Fri, 12 Jan 2018 08:22:49 +0000 (17:22 +0900)]
Add a test for new UID checking code.
Test: manual, this is a new test and it passes
Change-Id: I69a39039647ec05f970700e36c5f1e1e6e110f4a
Chalard Jean [Tue, 16 Jan 2018 09:43:05 +0000 (18:43 +0900)]
Remove UID_RANGES_ADDED and REMOVED.
Test: runtest frameworks-net
Test: also tested with VPN app
Test: also cts passing
Change-Id: I3530030996daeba05a8f2fffc5c6e21ed62e3f40
Chalard Jean [Wed, 27 Dec 2017 05:23:31 +0000 (14:23 +0900)]
Move VPN allowed UIDs into NetworkCapabilities.
Test: runtest frameworks-net
Test: also new specific tests for this new code
Test: also tested with VPN app
Test: also cts passing
Change-Id: If0311bae2bf99dedac959febadecf4f92f3064b8
Chalard Jean [Tue, 23 Jan 2018 12:25:37 +0000 (21:25 +0900)]
Pre-import to remove a conflict.
Test: compiles and passes checkstyle
Change-Id: I1ffdd88e6268fee0cf88992420ab21eb42928957
Lorenzo Colitti [Mon, 22 Jan 2018 02:54:46 +0000 (11:54 +0900)]
Add metered, roaming, and defaultNetwork info to NetworkTemplate.
This will allow data usage clients to query for and receive
callbacks on data usage matching these conditions.
Bug:
35142602
Test: atest FrameworksNetTests
Change-Id: I4d985a2734eeab7ee454c09cc2098b6b3c671c23
Merged-In: I4d985a2734eeab7ee454c09cc2098b6b3c671c23
Lorenzo Colitti [Mon, 22 Jan 2018 03:53:18 +0000 (12:53 +0900)]
Unbreak frameworks-net tests broken by missing libutilscallstack.
Test: atest FrameworksNetTest shows fewer failures
Change-Id: Ic6f2bc18e80d91226d8d49e047e3997ffc45e45a
Merged-In: Ic6f2bc18e80d91226d8d49e047e3997ffc45e45a
Lorenzo Colitti [Mon, 22 Jan 2018 03:50:58 +0000 (12:50 +0900)]
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
Lorenzo Colitti [Fri, 19 Jan 2018 17:02:56 +0000 (02:02 +0900)]
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
Lorenzo Colitti [Mon, 22 Jan 2018 12:00:49 +0000 (21:00 +0900)]
Support passing a template to NetworkStatsManager queries.
Currently, NetworkStatsManager queries and callbacks only allow
selecting network traffic based on network identifiers:
networkType, subscriptionId and networkId. The code ends up
converting these into a template under the hood.
Now that templates can express more fine-grained queries (e.g.,
select only roaming traffic, or select only traffic that's not
on the default network) add a hidden method to pass in a
template. This should have no security implications, as all the
access controls are performed in NetworkStatsService.
Bug:
35142602
Test: android.app.usage.cts.NetworkUsageStatsTest passes
Change-Id: Iab4afa26b34544299d2a9c501c1b0feb470e90a9
Merged-In: Iab4afa26b34544299d2a9c501c1b0feb470e90a9
Lorenzo Colitti [Thu, 18 Jan 2018 16:12:58 +0000 (01:12 +0900)]
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
Chenbo Feng [Fri, 19 Jan 2018 03:48:52 +0000 (19:48 -0800)]
Use /proc/net/dev to get stats summary
If the qtaguid proc file is no longer exist, the device is running new
eBPF module to do traffic accounting. So the NetworkStatsFactory need to
use the proc/net/dev interface to get the per interface traffic stats
summary. Also, adding a test to verify the helper function work properly
Bug:
30950746
Test: run NetworkStatsFactoryTest
Change-Id: Ia36808bf02f1637dd41a3e7c50917b91b1a77524
Chenbo Feng [Tue, 21 Nov 2017 01:03:59 +0000 (17:03 -0800)]
Add bpf support for NetworkStatsFactory
Add the native method used to read the detail information of network
stats from bpf maps. The native method of NetworkStatsFactory should
choose the correct implementation to get the stats detail depending on
the kernel version. Currently the bpf result is printed as a reference
and the actual behavior of NetworkStatsFactory should not change.
Test: NetworkStatsFactory related cts test should not fail.
Bug:
30950746
Change-Id: I4715a23559b5b2306bd556cea0431f0ed172a993
Chenbo Feng [Tue, 21 Nov 2017 02:23:46 +0000 (18:23 -0800)]
Add BPF support for NetworkStatsService
Add the native implementation for NetworkStatsService to read the
uidStatsMap and tagStatsMap to get the network traffic information.
Currently the implementation only try to get the data from bpf for a
reference but the final value returned is still from old xt_qtaguid
module. So the result will not be effected. The bpf implementation is
depending on libbpf inside netd.
Bug:
30950746
Test: CtsNetTestCases -t android.net.cts.TrafficStatsTest
Change-Id: Ia85e4d4d602f6bd536739d89085e6dc37ad82e15
Benedict Wong [Thu, 14 Dec 2017 02:26:40 +0000 (18:26 -0800)]
Add checks to ensure SPIs are not reused
This change adds an additional check in CheckIpsecConfig to prevent
users from using the same SPI twice. This allows for a more granular
error message.
Bug:
70642141
Test: Tests added in IpSecServiceParameterizedTest
Change-Id: I9621fb05c6b162bd8ae8db4ac1e64feaa9d0ac73
Badhri Jagan Sridharan [Tue, 23 Jan 2018 03:09:27 +0000 (03:09 +0000)]
Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL"
Amit Mahajan [Fri, 19 Jan 2018 01:51:53 +0000 (17:51 -0800)]
Added new slot status related broadcast.
Test: none
Bug:
64131518
Merged-in: I0a5825a1d121dc22f042fd71598f58e064e9e2a2
Change-Id: I0a5825a1d121dc22f042fd71598f58e064e9e2a2
Yin-Chia Yeh [Tue, 23 Jan 2018 02:12:57 +0000 (02:12 +0000)]
Merge "Camera: remove NOT_PRESENT cameras"
am:
174df238ac
Change-Id: I2c0dd5ccd8c8a165b568563051ad42dba6082792
Lorenzo Colitti [Tue, 23 Jan 2018 02:08:18 +0000 (02:08 +0000)]
Merge "Remove obsolete NetworkStats.Entry constructor."
am:
1683b6968d
Change-Id: I72fe99d5e662a6a154f7b2d970c5926ee696e541
Qingxi Li [Tue, 23 Jan 2018 01:12:50 +0000 (01:12 +0000)]
Merge "Add broadcast action for carrier setup"
am:
b60e42becd
Change-Id: I3bcde10528fc1fa722995e7666ee6faa7db1d0cd
Badhri Jagan Sridharan [Fri, 12 Jan 2018 00:56:29 +0000 (16:56 -0800)]
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
Treehugger Robot [Tue, 23 Jan 2018 00:52:00 +0000 (00:52 +0000)]
Merge "Camera: remove NOT_PRESENT cameras"
yuemingw [Tue, 23 Jan 2018 00:47:01 +0000 (00:47 +0000)]
Merge "Add NetworkTypeBitmask into public ApnSetting."
am:
278dd4ab90
Change-Id: I63be092c9f978cf0e0b029e6836d5f0b876831f6
Chen Xu [Tue, 23 Jan 2018 00:42:06 +0000 (00:42 +0000)]
Merge "address carrier id api review feedback"
am:
2f6b2726e6
Change-Id: I40fb765e4c4eb844826ae8e305ddcc7ef1c281f4
Lorenzo Colitti [Tue, 23 Jan 2018 00:15:15 +0000 (00:15 +0000)]
Merge "Remove obsolete NetworkStats.Entry constructor."
Benedict Wong [Mon, 22 Jan 2018 23:57:28 +0000 (23:57 +0000)]
Merge "Address comments and final cleanup from refcounting integration"
am:
222529d95c
Change-Id: Ie0bc2b81e09ee874ef848905bb486967a857c6d1
Treehugger Robot [Mon, 22 Jan 2018 23:55:49 +0000 (23:55 +0000)]
Merge "Add broadcast action for carrier setup"
Jack Yu [Sun, 21 Jan 2018 03:41:00 +0000 (19:41 -0800)]
Combined flags of data service requests into one reason param
Made the API flexible for future expansion. The two boolean flag
'reasonShutdown' and 'isHandover' are merged into the 'reason'
params.
Test: Manual
bug:
64132030
Change-Id: I29a0ca6a7c3b897910f3bb6076f44315adc91893
Treehugger Robot [Mon, 22 Jan 2018 22:53:38 +0000 (22:53 +0000)]
Merge "Add NetworkTypeBitmask into public ApnSetting."
Chen Xu [Mon, 22 Jan 2018 22:44:02 +0000 (22:44 +0000)]
Merge "address carrier id api review feedback"
Qingxi Li [Fri, 19 Jan 2018 20:24:05 +0000 (12:24 -0800)]
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
fionaxu [Fri, 5 Jan 2018 23:38:11 +0000 (15:38 -0800)]
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
Benedict Wong [Mon, 22 Jan 2018 20:32:18 +0000 (20:32 +0000)]
Merge "Address comments and final cleanup from refcounting integration"
Andreas Gampe [Mon, 22 Jan 2018 19:48:28 +0000 (19:48 +0000)]
Merge "Debug: Add attachJvmtiAgent with classloader"
am:
940c0341f0
Change-Id: I0c9179b373040e7d4f54a5ad9835d14624012999
Benedict Wong [Mon, 22 Jan 2018 19:44:43 +0000 (19:44 +0000)]
Merge "Rename create/delete transform methods"
am:
7ee26e72cf
Change-Id: I76576d1f3193fcbb3680fb29893cf696ea7a41fe
Treehugger Robot [Mon, 22 Jan 2018 18:22:07 +0000 (18:22 +0000)]
Merge "Debug: Add attachJvmtiAgent with classloader"
Benedict Wong [Mon, 22 Jan 2018 17:57:15 +0000 (17:57 +0000)]
Merge "Rename create/delete transform methods"
yuemingw [Mon, 22 Jan 2018 17:32:09 +0000 (17:32 +0000)]
Add NetworkTypeBitmask into public ApnSetting.
Sync with aosp/556766.
Moved from ag/
3477310.
Bug:
68208293
Test: manual
Change-Id: I04b901c46b7bbce4ed7d52895fcc904fb713fb69
Robert Sesek [Mon, 22 Jan 2018 17:26:39 +0000 (12:26 -0500)]
Use the correct value for Process.WEBVIEW_ZYGOTE_UID.
When the libcutils constant was added there a merge conflict, which
caused the AID_WEBVIEW_ZYGOTE value to land with a different value than
the Java-side Process value. Nothing yet uses the Process constant, so
there were no ill effects.
Test: m
Change-Id: I8cc87bce1ddbdcdaf79d85c828d86837e96cce21
Benoit Lamarche [Mon, 22 Jan 2018 16:38:41 +0000 (17:38 +0100)]
Fail when there is an ASM error
Otherwise during a build, Locked Region Code Injection may encounter an
ASM Analyzer exception, and the build will not fail, even though
injection won't have succeeded.
Test: make
Change-Id: Iee69f1a78fde735db62c7f73405b8cec4e410793
Lorenzo Colitti [Sun, 21 Jan 2018 14:00:55 +0000 (23:00 +0900)]
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
Pavlin Radoslavov [Sun, 21 Jan 2018 00:26:11 +0000 (00:26 +0000)]
Merge "Multi-A2DP support - add a new internal API to suppress Audio Noisy intent"
am:
7e3b1832c4
Change-Id: I4b75e8565dc0b80d6ca3825e87370a72c726bd25