OSDN Git Service
Lorenzo Colitti [Thu, 11 Jan 2018 03:58:57 +0000 (03:58 +0000)]
Merge "Move more core networking tests to framework/base/tests/net."
am:
d6c3813c08
Change-Id: Ic1ad8ba5a4180ef6a798d4330c72920984d5040c
Erik Kline [Thu, 11 Jan 2018 03:55:41 +0000 (03:55 +0000)]
Merge "Refactor to InterfaceParams utility class"
am:
6a91687bcd
Change-Id: Ia8ea85890c86cf57b0bc701c2624762144af301e
Lorenzo Colitti [Thu, 11 Jan 2018 03:09:40 +0000 (03:09 +0000)]
Merge "Move more core networking tests to framework/base/tests/net."
Treehugger Robot [Thu, 11 Jan 2018 02:52:00 +0000 (02:52 +0000)]
Merge "Refactor to InterfaceParams utility class"
Erik Kline [Fri, 8 Dec 2017 08:47:50 +0000 (17:47 +0900)]
Refactor to InterfaceParams utility class
NetworkInterface throws Exceptions every time you look at it askance.
Try to make something we instantiate fully, once, and pass it around.
Partial MacAddress-ification as well, for good measure.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- basic IPv6 tethering works
Bug:
32163131
Bug:
62476366
Change-Id: I16c145fddb4e76387370338d792a438eed886d7f
Qingxi Li [Wed, 10 Jan 2018 22:34:35 +0000 (22:34 +0000)]
Merge "Add API EuiccController#startOtaUpdatingIfNecessary"
am:
999d998fb0
Change-Id: If42a792cf2185452d2e654df7ef059cf88e23221
Treehugger Robot [Wed, 10 Jan 2018 21:29:02 +0000 (21:29 +0000)]
Merge "Add API EuiccController#startOtaUpdatingIfNecessary"
Qingxi Li [Thu, 14 Dec 2017 23:36:06 +0000 (15:36 -0800)]
Add API EuiccController#startOtaUpdatingIfNecessary
This function requests calling app has WRITE_EMBEDDED_SUBSCRIPTIONS
permission. It will check whether the OTA update needed to be done
first. If current eUICC OS isn't latest one and OTA needed to be
performed, it will update eUICC OS. When the OS update is started or
finished, a broadcast will be sent.
Bug:
37279356
Test: E2E
Merged-In: Iea86add4bdc01c79a8714af4b3a89735ba78ee74
Change-Id: Iea86add4bdc01c79a8714af4b3a89735ba78ee74
Victor Hsieh [Wed, 10 Jan 2018 19:38:49 +0000 (19:38 +0000)]
Merge "Revert "Move zygote's seccomp setup to post-fork""
am:
54da93b981
Change-Id: Ibdeb9fb6af3525e6329d42c7eef654f14396bcd6
Jack Yu [Wed, 10 Jan 2018 19:34:50 +0000 (19:34 +0000)]
Merge "Added Cell identity for TD-SCDMA and a base class CellIdentity"
am:
5e90553bcf
Change-Id: I777781ddf78e08373c1e5d4989374847b03800cd
Jerry Zhang [Wed, 10 Jan 2018 19:26:48 +0000 (19:26 +0000)]
Merge "Revamp USB tethering startup flow."
am:
90fddefd5e
Change-Id: Ica932756d19c7ac874ae822c9785e856dcf81db3
Myles Watson [Wed, 10 Jan 2018 19:22:23 +0000 (19:22 +0000)]
Merge "Don't wait for Bluetooth when shutting down"
am:
d9b3322e88
Change-Id: I31142d6ac6b04d2cfb7fcfc721d251a956c81c11
Treehugger Robot [Wed, 10 Jan 2018 18:46:36 +0000 (18:46 +0000)]
Merge "Revert "Move zygote's seccomp setup to post-fork""
Jack Yu [Wed, 10 Jan 2018 18:39:53 +0000 (18:39 +0000)]
Merge "Added Cell identity for TD-SCDMA and a base class CellIdentity"
Jerry Zhang [Wed, 10 Jan 2018 18:38:44 +0000 (18:38 +0000)]
Merge "Revamp USB tethering startup flow."
Jerry Zhang [Wed, 20 Dec 2017 22:26:39 +0000 (14:26 -0800)]
Revamp USB tethering startup flow.
Modify usb tethering flow to no longer require
mUsbTetherRequested. The new simplified flow is:
1. Usb rndis function is set through UsbManager
2. Usb is configured with rndis enabled
3. We tether the USB interface
4. Usb is disconnected
5. We untether the USB interface
This allows USB tethering to be enabled through
either UsbManager or ConnectivityManager and aligns
the flow to be similar to other usb function services
such as MTP.
Bug:
62876645
Test: Enable and disable tethering through connectivity and with `svc
usb setFunction rndis`
Change-Id: Ica4203a499db177999302e099e28948b06ef2298
Treehugger Robot [Wed, 10 Jan 2018 18:19:03 +0000 (18:19 +0000)]
Merge "Don't wait for Bluetooth when shutting down"
Myles Watson [Sat, 6 Jan 2018 00:12:54 +0000 (16:12 -0800)]
Don't wait for Bluetooth when shutting down
Bluetooth doesn't need to be shut down cleanly; shutting it down just
slows down the shutdown process.
Change-Id: I91fc9b26930a392f0c4462c76626a966051aea7b
Merged-In: Ic2ed89dd618806adc6646066ab0956dea4a94d8e
Bug:
70855323
Test: Boot, shut down, boot, shut down.
Victor Hsieh [Wed, 10 Jan 2018 17:22:25 +0000 (17:22 +0000)]
Revert "Move zygote's seccomp setup to post-fork"
This reverts commit
6a4a3398325787f6cb1b93db17a7bf50d353e2a5.
Reason for revert: caused some SELinux error
Bug:
71768585
Change-Id: I0ef270ec6fed1d5d96b4257ec1a2dd6a55a816ed
Merged-In: Ic1b81e146b52b68445ba634de39657f199107da3
Jordan Liu [Wed, 10 Jan 2018 17:15:17 +0000 (17:15 +0000)]
Merge "Add precise disconnect cause in DisconnectCause"
am:
8098078edf
Change-Id: Idac4f27406b359bf51ae33f483d651e9e8316504
Jordan Liu [Wed, 10 Jan 2018 17:06:14 +0000 (17:06 +0000)]
Merge "Add precise disconnect cause in DisconnectCause"
Lorenzo Colitti [Fri, 14 Apr 2017 15:12:33 +0000 (00:12 +0900)]
Move more core networking tests to framework/base/tests/net.
Test: "runtest frameworks-net" passes except for already-failing IpConnectivityMetricsTest
Change-Id: I2a20d546089699ac67bc819f10a8fcd50c637ac4
Jack Yu [Thu, 28 Dec 2017 22:41:12 +0000 (14:41 -0800)]
Added Cell identity for TD-SCDMA and a base class CellIdentity
Added CellIdentityTdscdma for TDS-CDMA cell identity. Also added
a base class for existing CellIdentityXxx so that the network
service can return specific RAT cell identity through the
network service callback API which takes generic cell identity
as the parameter.
This is the preliminary change for IWLAN refactoring since cell
identity is part of the CS/PS network registration.
bug:
64132030
Test: Unit tests
Change-Id: I3ca405d687667b6c43e782339edec26a6f6edfc9
Holly Jiuyu Sun [Wed, 10 Jan 2018 05:35:48 +0000 (05:35 +0000)]
Merge "Merge EuiccProfile into EuiccProfileInfo."
am:
b01bd54b11
Change-Id: I98c726fc7d6fb91e16234773fe6423b7e111126e
Holly Jiuyu Sun [Wed, 10 Jan 2018 05:21:35 +0000 (05:21 +0000)]
Merge "Merge EuiccProfile into EuiccProfileInfo."
yinxu [Wed, 10 Jan 2018 03:18:37 +0000 (03:18 +0000)]
Merge "Check null before calling clone()"
am:
e1bdd513d0
Change-Id: Ifabe6352c950f9d6ead4cbdd4345ef1fb20f065d
Treehugger Robot [Wed, 10 Jan 2018 03:07:26 +0000 (03:07 +0000)]
Merge "Check null before calling clone()"
Jack Yu [Wed, 10 Jan 2018 02:33:16 +0000 (02:33 +0000)]
Merge "Exposed CDMA SID/NID get APIs"
am:
0cb936a855
Change-Id: Iec76a777a126a10c012363247acb4b6a3516c008
Treehugger Robot [Wed, 10 Jan 2018 02:19:20 +0000 (02:19 +0000)]
Merge "Exposed CDMA SID/NID get APIs"
Elliott Hughes [Wed, 10 Jan 2018 01:35:34 +0000 (01:35 +0000)]
Merge "Remove obsolete workaround."
am:
f448371208
Change-Id: I2bd057c12b9915b9e45b206b9839d1a57b296f26
Treehugger Robot [Wed, 10 Jan 2018 01:24:41 +0000 (01:24 +0000)]
Merge "Remove obsolete workaround."
Cassie Han [Wed, 10 Jan 2018 01:08:55 +0000 (01:08 +0000)]
Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually."
am:
72acefa6d8
Change-Id: I25ad45c52cdcb9b4bf3d21f4f3b71c68e8ace362
Cassie Han [Wed, 10 Jan 2018 00:55:32 +0000 (00:55 +0000)]
Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually."
yinxu [Wed, 10 Jan 2018 00:27:10 +0000 (16:27 -0800)]
Check null before calling clone()
Bug:
67748005
Test: Basic telephony sanity
Change-Id: Ia46a82823b2d3c2bf3a6cb77a6fe191a7f7cb5d0
Jack He [Wed, 10 Jan 2018 00:18:15 +0000 (00:18 +0000)]
Merge "HFP: Add isInbandRingingEnabled() API (1/4)"
am:
b1065d6995
Change-Id: Ia3112caa3971406cb0ef44cc25c19865a0b6ddf1
Treehugger Robot [Wed, 10 Jan 2018 00:07:11 +0000 (00:07 +0000)]
Merge "HFP: Add isInbandRingingEnabled() API (1/4)"
Malcolm Chen [Tue, 9 Jan 2018 23:55:47 +0000 (23:55 +0000)]
Merge "Add isMobileDataEnabled in TelephonyManager."
am:
ed7eead23b
Change-Id: I851529bc4b5507ffa04c07a840aeba6eb3c7f94b
Treehugger Robot [Tue, 9 Jan 2018 23:46:55 +0000 (23:46 +0000)]
Merge "Add isMobileDataEnabled in TelephonyManager."
Jack He [Sat, 6 Jan 2018 01:17:06 +0000 (17:17 -0800)]
HFP: Add isInbandRingingEnabled() API (1/4)
* Use BluetoothHeadset.isInbandRingingEnabled() API to check whether
in-band ringing is currently enabled in the system when deciding on
audio routes for ringtone
* Add this as a hidden internal API for system components
Bug:
71646213
Test: make, toggle in-band ringing from Development Settings and observe
whether Telecom service tries to open SCO when there is an
incoming call
Change-Id: I1ef0dd2b54ace7649ddd1f043f0ef5847743a5c4
Holly Jiuyu Sun [Thu, 7 Dec 2017 23:35:49 +0000 (15:35 -0800)]
Merge EuiccProfile into EuiccProfileInfo.
After EuiccCard is moved to the platform, it can depend on
EuiccProfileInfo directly.
Bug:
70292228
Test: unit test
Change-Id: Ibe2c61ce9c4d2c99bac1cd9df8bb62414c46feee
Pengquan Meng [Tue, 9 Jan 2018 23:06:10 +0000 (23:06 +0000)]
Merge "Add connection serivce focus api interface"
am:
2f37060ee0
Change-Id: I0797828f9d8edee95b1b8ce8c838c766f5775f97
Treehugger Robot [Tue, 9 Jan 2018 22:54:42 +0000 (22:54 +0000)]
Merge "Add connection serivce focus api interface"
Elliott Hughes [Tue, 9 Jan 2018 22:44:10 +0000 (14:44 -0800)]
Remove obsolete workaround.
Bug: http://b/
24465209
Test: manually ran the app.
Change-Id: Id64e92875417e62ae225c3369cf6bf58048dcc97
Myles Watson [Tue, 9 Jan 2018 22:19:53 +0000 (22:19 +0000)]
Merge "BluetoothProfile: Add Object Push Profile (OPP)"
am:
37275780c0
Change-Id: Ie3c40bcfd0f0eee0f8fe1ed8cac680f2c139de0f
Treehugger Robot [Tue, 9 Jan 2018 22:10:01 +0000 (22:10 +0000)]
Merge "BluetoothProfile: Add Object Push Profile (OPP)"
Victor Hsieh [Tue, 9 Jan 2018 21:51:57 +0000 (21:51 +0000)]
Merge "Move zygote's seccomp setup to post-fork"
am:
5d33c10a96
Change-Id: I1baf09c5b8924e070b473725548faf8a5b48a623
Treehugger Robot [Tue, 9 Jan 2018 21:41:19 +0000 (21:41 +0000)]
Merge "Move zygote's seccomp setup to post-fork"
Makoto Onuki [Tue, 9 Jan 2018 21:06:07 +0000 (21:06 +0000)]
Merge "Fix sync initialization on secondary users"
am:
99f99a52e7
Change-Id: I29f9430a6a3fb8c8a77621f68b0af37b94e3be21
Treehugger Robot [Tue, 9 Jan 2018 20:56:47 +0000 (20:56 +0000)]
Merge "Fix sync initialization on secondary users"
gaochong [Tue, 9 Jan 2018 20:39:35 +0000 (20:39 +0000)]
Merge "Fix ResolverActivity don't show items"
am:
e251bb72ed
Change-Id: Id4877102db82616c5ad1c6e929721fbddb92b129
Treehugger Robot [Tue, 9 Jan 2018 20:30:29 +0000 (20:30 +0000)]
Merge "Fix ResolverActivity don't show items"
Jack Yu [Tue, 2 Jan 2018 23:51:34 +0000 (15:51 -0800)]
Exposed CDMA SID/NID get APIs
Made two existing hidden APIs getSystemId() and getNetworkId()
into public APIs.
Test: Telephony sanity tests
bug:
32718590
Change-Id: I436bd2699f8f805def753878d93e7dbf524e5f44
Victor Hsieh [Wed, 20 Dec 2017 17:51:51 +0000 (09:51 -0800)]
Move zygote's seccomp setup to post-fork
Before this change, seccomp filter setup is as early as in zygote's main
function. To make it possible to split app and system server's filter,
this postpone the setup to after fork. It also starts to call app
specific and system server specific setup function.
In terms of performance since this happens at fork, the measure shows
the overhead is negligible. Assuming 130 instruction in the BPF, on
walleye, even when running on little core with fixed low frequency, each
setup took about 60.9us on average. When it runs on big core with
higher frequency, it took about 39.3us.
Test: (cts) -m CtsSecurityTestCases -t android.security.cts.SeccompTest
Bug:
63944145
Change-Id: I748735b478405098beac1e200d911c13ea60e380
Merged-In: I748735b478405098beac1e200d911c13ea60e380
Brad Ebinger [Tue, 9 Jan 2018 19:26:18 +0000 (19:26 +0000)]
Merge "Remove hashing for PII in Telecom Logging"
am:
e77808d936
Change-Id: Ib3e5180536ded4094c65476f5d5203f6c094f204
Brad Ebinger [Tue, 9 Jan 2018 19:18:42 +0000 (19:18 +0000)]
Merge "Remove hashing for PII in Telecom Logging"
Pengquan Meng [Wed, 22 Nov 2017 02:01:13 +0000 (18:01 -0800)]
Add connection serivce focus api interface
This add new api interface to ConnectionService to support the
connection service focus api.
Bug:
69651192
Test: manually
Change-Id: Iea49d95b086d32a0ebaf8e9f34fe4556953a0fd5
Merged-In: Iea49d95b086d32a0ebaf8e9f34fe4556953a0fd5
Benedict Wong [Tue, 9 Jan 2018 18:31:14 +0000 (18:31 +0000)]
Merge "Add validation to IpSecConfig algorithm setters"
am:
a954f20f46
Change-Id: I7d241a4348fd1339ff7475ee9301c7fe6c7453c0
Benedict Wong [Tue, 9 Jan 2018 18:18:28 +0000 (18:18 +0000)]
Merge "Add validation to IpSecConfig algorithm setters"
Todd Kennedy [Tue, 9 Jan 2018 17:31:44 +0000 (17:31 +0000)]
Merge "Add patb to owners"
am:
a2525e506d
Change-Id: Iae9eaea2fee3253155c957a000ca7eeb80474503
Todd Kennedy [Tue, 9 Jan 2018 17:21:12 +0000 (17:21 +0000)]
Merge "Add patb to owners"
Todd Kennedy [Tue, 9 Jan 2018 17:19:15 +0000 (09:19 -0800)]
Add patb to owners
Test: None
Change-Id: I70429cd02fac901efd16e47e6566358c78ae0e23
Malcolm Chen [Tue, 9 Jan 2018 07:11:43 +0000 (07:11 +0000)]
Merge "Rename RadioNetworkConstants to NetworkConstants."
am:
289b3fbca8
Change-Id: Ic7d966c3e7ce1b8adc9ca3acd461d6e65df2cffe
Treehugger Robot [Tue, 9 Jan 2018 07:04:01 +0000 (07:04 +0000)]
Merge "Rename RadioNetworkConstants to NetworkConstants."
gaochong [Tue, 9 Jan 2018 06:02:23 +0000 (14:02 +0800)]
Fix ResolverActivity don't show items
ResolverActivity sort the list resolved intent with AsyncTask.
The method sort hold CountDownLatch to wait the time-consuming
operation. In some case, the operation doesn't end and the
CountDownLatch can't be released.The default excutor of AsyncTask
is serial. There should release CountDownLatch in destroy()
to avoid this case.
Change-Id: Ie10126f735d9f511dfe086c21f3f5ffaeb831086
Signed-off-by: gaochong <gaochong@xiaomi.com>
Test: manual - repeatedly test ResolverActivity show correctly
Bug:
71730061
Hans Boehm [Tue, 9 Jan 2018 04:46:32 +0000 (04:46 +0000)]
Merge "Only count uncleared ProxyMap refs when deciding to crash"
am:
90027eb1c2
Change-Id: I56471aa9ac0b93e3280b48fed3b29ad2b743cf39
Hans Boehm [Tue, 9 Jan 2018 04:35:31 +0000 (04:35 +0000)]
Merge "Only count uncleared ProxyMap refs when deciding to crash"
Malcolm Chen [Tue, 28 Nov 2017 23:57:14 +0000 (15:57 -0800)]
Add isMobileDataEnabled in TelephonyManager.
Added a new hidden API isMobileDataEnabled in TelephonyManager.
Rename related APIs to isUserMobileDataEnabled,
isUserMobileDataEnabled and setUserMobileDataEnabled to better
clarify their functionality.
Bug:
69814555
Test: build
Change-Id: I2f186f1e7550cafbe4ee3a5af293c39274cbfeaa
Merged-In: I2f186f1e7550cafbe4ee3a5af293c39274cbfeaa
Myles Watson [Fri, 5 Jan 2018 21:54:34 +0000 (13:54 -0800)]
BluetoothProfile: Add Object Push Profile (OPP)
Test: toggle Bluetooth
Change-Id: I5aec940ba3d6c6364c2de667426d98d0b3cea0c6
Ruchi Kandoi [Tue, 9 Jan 2018 00:01:09 +0000 (00:01 +0000)]
Merge "Don't wait for NFC when shutting down."
am:
5d286326b1
Change-Id: Ie1a26e5b7905fc7b1a6dbe0e1ee8f80c1030d1cc
Treehugger Robot [Mon, 8 Jan 2018 23:49:06 +0000 (23:49 +0000)]
Merge "Don't wait for NFC when shutting down."
Ruchi Kandoi [Wed, 18 Oct 2017 20:06:40 +0000 (13:06 -0700)]
Don't wait for NFC when shutting down.
NFC doesn't store any state before powering off, and hence it is okay to
not wait for it while shutting down.
Bug:
65761561
Test: Boot and shutdown
Change-Id: Ic8243bdb9c6d12daf6cff5784046286bfa8f4d53
(cherry picked from commit
20bc30f4cedff1043c4c665cfe68f7d7fd16a801)
Merged-In: Ic8243bdb9c6d12daf6cff5784046286bfa8f4d53
Hans Boehm [Wed, 3 Jan 2018 01:36:27 +0000 (17:36 -0800)]
Only count uncleared ProxyMap refs when deciding to crash
Add a method to compute the size of a ProxyMap without cleared
references. Use it in the crash decision. Report both counts, as
well as the count after a forced GC before actually crashing.
Rename the histogram generating function after a small refactoring
to make that easier.
When we crash, we now generate a message like the following
(generated here with reduced thresholds):
01-03 01:40:52.273 4793 4947 E JavaBinder: java.lang.AssertionError:
Binder ProxyMap has too many entries: 277 (total), 275 (uncleared),
257 (after GC). BinderProxy leak?
after the histogram. Unfortunately, the intervening GC may take some
time, and other intervening messages may sneak into the log between
them.
Experiments so far suggest that none of this greatly affects the
decision when to die. But this eliminates uncertainty as to whether
there was really a problem.
Bug:
71353150
Test: Tested with reduced thresholds, and then booted AOSP.
Change-Id: I53f24bae23eedcdb78a1c32296c65692b7bb2c42
Cassie Han [Mon, 8 Jan 2018 17:32:39 +0000 (17:32 +0000)]
Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config."
am:
9c1279d2ae
Change-Id: I2c5c351cbe01bd5bd66d15a382ff6df5bede8c6a
Cassie Han [Mon, 8 Jan 2018 17:25:26 +0000 (17:25 +0000)]
Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config."
Toby Sargeant [Mon, 8 Jan 2018 12:16:00 +0000 (12:16 +0000)]
Merge "Add a Java FindAddress implentation."
am:
9ea410a6f8
Change-Id: Iff0adac9310f836df5f75c64c17ea3c72cd940d4
Toby Sargeant [Mon, 8 Jan 2018 12:05:12 +0000 (12:05 +0000)]
Merge "Add a Java FindAddress implentation."
Colin Cross [Sat, 6 Jan 2018 17:56:13 +0000 (17:56 +0000)]
Merge "Remove obsolete aidl list"
am:
abac8f7a86
Change-Id: If4b2f5693947dfd8d35531d7a399b7f3d764506f
Jack He [Sat, 6 Jan 2018 17:51:45 +0000 (17:51 +0000)]
Merge changes from topics "bt-hfp-add-set-active-device-method", "bt-system-api-annotations"
am:
25259faa27
Change-Id: Ife08cbcb0490f55c81f239f96aef6e8e2a02e8d3
Dan Albert [Sat, 6 Jan 2018 17:47:49 +0000 (17:47 +0000)]
Merge "Move to libc++ from stlport."
am:
c6dd5f9037
Change-Id: Ie42f0cf03a005215b96bbbef16ea62e541fb12a8
Yi Kong [Sat, 6 Jan 2018 17:44:50 +0000 (17:44 +0000)]
Merge "Add virtual dtor for virtual classes"
am:
27f61a94d6
Change-Id: Ic45e81f483e31b01abe6195bd63174c8253b82ae
Pavlin Radoslavov [Sat, 6 Jan 2018 17:41:05 +0000 (17:41 +0000)]
Merge "Added internal API to get/set the A2DP Active Device"
am:
6efee9c079
Change-Id: I5e82a41c4bcf546bdc8fd08c56103c333745c60c
Steven Moreland [Sat, 6 Jan 2018 17:37:23 +0000 (17:37 +0000)]
Merge "Generic Mutable class for HIDL code."
am:
0f05ce94c3
Change-Id: I8ee4b650b96279efe26bdacb4d09a6a0317960e7
Jack He [Sat, 6 Jan 2018 17:32:38 +0000 (17:32 +0000)]
Merge "Bluetooth: Remove strings for enabling inband ringing"
am:
02a0397643
Change-Id: Id6c9ab4a230e5c242402f78212f21943e1a7604f
nharold [Sat, 6 Jan 2018 17:29:12 +0000 (17:29 +0000)]
Merge changes from topic "ipsec-resource-id-cleanup"
am:
2b36299c73
Change-Id: I5461b0e0746f8c60b425126d9badbae4630395bb
Treehugger Robot [Sat, 6 Jan 2018 02:50:58 +0000 (02:50 +0000)]
Merge "Remove obsolete aidl list"
Colin Cross [Thu, 4 Jan 2018 22:59:10 +0000 (14:59 -0800)]
Remove obsolete aidl list
Remove the obsolete aidl list, framework.aidl is now generated
from the stubs jars.
Bug:
70046217
Test: m checkbuild
Change-Id: I2417f0a8f193bd4db4058f6f0bb05c147e18de25
Merged-In: I2417f0a8f193bd4db4058f6f0bb05c147e18de25
(cherry picked from commit
fac48f998e763060dfdfb6e76927ec85aa63e1eb)
Treehugger Robot [Sat, 6 Jan 2018 01:28:40 +0000 (01:28 +0000)]
Merge changes from topics "bt-hfp-add-set-active-device-method", "bt-system-api-annotations"
* changes:
HFP: Add APIs for set and get active device (1/3)
Add SystemApis annotations
Treehugger Robot [Sat, 6 Jan 2018 00:35:49 +0000 (00:35 +0000)]
Merge "Move to libc++ from stlport."
Treehugger Robot [Fri, 5 Jan 2018 23:27:33 +0000 (23:27 +0000)]
Merge "Add virtual dtor for virtual classes"
Jack He [Wed, 3 Jan 2018 20:13:26 +0000 (12:13 -0800)]
HFP: Add APIs for set and get active device (1/3)
1. Call BluetoothHeadset.setActiveDevice(BluetoothDevice device) to set
a connected HFP/HSP device as active.
2. Listen for BluetoothHeadset.ACTION_ACTIVE_DEVICE_CHANGED intent
that will contain the latest active device (in EXTRA_DEVICE field).
If the active device could not be changed, the EXTRA_DEVICE
field could be null.
3. If setActiveDevice() is NOT in-progress, BluetoothA2dp.getActiveDevice()
can be used. If setActiveDevice() is in-progress, the result is undefined.
4. BluetoothHeadset.setActiveDevice() could be called by some other parts of
the system, so interested parties should always listen for
BluetoothHeadset.ACTION_ACTIVE_DEVICE_CHANGED intents and prepared
for active device updates.
Bug:
68951996
Test: manual
Change-Id: I22ca639a04fed7bf17df59c405ddeda90dafb8ff
Selim Gurun [Wed, 18 Oct 2017 00:01:38 +0000 (17:01 -0700)]
Add SystemApis annotations
There are some number of places where bluetooth APIs are used via
reflection from GMSCore. Add proper annotations.
Bug:
67052734
Test: Manual - and using make update-api
Change-Id: Ib6e3aa1ff5b6f9cdc78367f9be13ed00542d6f65
(cherry picked from commit
64bd35ef2cb40bbf9476a3bf63a763d5a32cc73b)
Pavlin Radoslavov [Fri, 5 Jan 2018 21:45:31 +0000 (21:45 +0000)]
Merge "Added internal API to get/set the A2DP Active Device"
Pavlin Radoslavov [Tue, 19 Dec 2017 21:20:06 +0000 (13:20 -0800)]
Added internal API to get/set the A2DP Active Device
1. Call BluetoothA2dp.setActiveDevice(BluetoothDevice device) to set
a connected A2DP device as active.
The value of "device" could be null to clear the active device
and stop streaming audio to a Bluetooth device.
2. Listen for BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED intent
that will contain the latest active device (in EXTRA_DEVICE field).
If the active device could not be changed, the EXTRA_DEVICE
field could be null.
3. If setActiveDevice() is NOT in-progress, BluetoothA2dp.getActiveDevice()
can be used. If setActiveDevice() is in-progress, the result is undefined.
4. BluetoothA2dp.setActiveDevice() could be called by some other parts of
the system, so interested parties should always listen for
BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED intents and prepared
for active device updates.
Bug:
71555243
Test: Manual
Change-Id: I661b6882e8e6b437db50210aec1dd12a10199969
Treehugger Robot [Fri, 5 Jan 2018 21:44:37 +0000 (21:44 +0000)]
Merge "Generic Mutable class for HIDL code."
Treehugger Robot [Fri, 5 Jan 2018 20:41:01 +0000 (20:41 +0000)]
Merge "Bluetooth: Remove strings for enabling inband ringing"
Steven Moreland [Fri, 5 Jan 2018 17:41:10 +0000 (09:41 -0800)]
Generic Mutable class for HIDL code.
In general, using Mutable inside of structures
or as API arguments is a code smell. However, it
is the most syntactically clean way of fetching
something out of a lambda or inner class.
Using this, one can do:
Mutable<Result> res = new Mutable<>();
hidlObject.foo((...) -> {
res.value = ...;
});
There is an alternative:
Result a[] = new Result[1];
hidlObject.foo((...) -> {
a[0] = ...;
});
However, this alternative syntax is relatively messy.
Bug: N/A
Test: boot, use w/ wifi
Change-Id: Ibff13c653cc17bd25ddbb0534ba21ef485bff7aa
Jack He [Thu, 7 Dec 2017 23:18:40 +0000 (15:18 -0800)]
Bluetooth: Remove strings for enabling inband ringing
* As in-band ringing is enabled by default on supported devices, user
action in development settings should be disabling it instead of
enabling it
* The new string is added to packages/apps/Settings and the old string
is hence removed from SettingsLib
Bug:
65383086
Test: make, try toggling the preference and verify in-band ringing's
behavior
Change-Id: I18858e86f4127f6555cce27d239d2682b6134fe2
Merged-In: I18858e86f4127f6555cce27d239d2682b6134fe2
(cherry picked from commit
326f1db42cabe8a7f2bcaef441a3353af98bba5f)
Dan Albert [Fri, 5 Jan 2018 19:08:20 +0000 (11:08 -0800)]
Move to libc++ from stlport.
Test: make checkbuild
Bug: None
Change-Id: If2be2abedec1abb2970e8c42170d4a69c0fb4e3d
nharold [Fri, 5 Jan 2018 19:05:09 +0000 (19:05 +0000)]
Merge changes from topic "ipsec-resource-id-cleanup"
* changes:
IpSecService - Convert mNextResourceId from AtomicInt to Int
IpSec Invalidate the Resource IDs on close()
Tobias Sargeant [Fri, 5 Jan 2018 14:34:38 +0000 (14:34 +0000)]
Add a Java FindAddress implentation.
This stops calling findAddress (possibly indirectly via Linkify) from
loading webview native code, resulting in a performance and memory
improvement for those apps that call WebView#findAddress but do not
otherwise use WebView.
Bug:
22362008
Test: Existing WebView CTS test.
Change-Id: I5fcab725ceaf0d6a00e931d3b6cd2f3799d68391