OSDN Git Service
Anton Hansson [Wed, 2 May 2018 17:17:13 +0000 (10:17 -0700)]
Merge "frameworks/base: Update a few more references to android.jar."
am:
85e68063a9
Change-Id: I6338218432a1e9d3f99b392f6736fa6452809b82
Anton Hansson [Wed, 2 May 2018 15:31:27 +0000 (15:31 +0000)]
Merge "frameworks/base: Update a few more references to android.jar."
David Brazdil [Wed, 2 May 2018 11:48:44 +0000 (04:48 -0700)]
Merge "Build same hidden API lists as in pi-dev"
am:
c859c8097b
Change-Id: Ie11ef705d2e921ddecb845023c039e68f9633ea3
David Brazdil [Wed, 2 May 2018 10:40:37 +0000 (10:40 +0000)]
Merge "Build same hidden API lists as in pi-dev"
David Brazdil [Wed, 2 May 2018 10:36:39 +0000 (03:36 -0700)]
Merge "Publish hidden API light greylist from P"
am:
0835de9e17
Change-Id: I6c3f41abba7c96ffa93a446fa80951e95586feb5
David Brazdil [Thu, 26 Apr 2018 13:05:13 +0000 (14:05 +0100)]
Build same hidden API lists as in pi-dev
P branch builds hidden API lists in a separate invocation of droiddoc
which includes @SystemApi and @TestApi annotated class members in the
public API. This patch creates the same build rule in the master branch,
only with Soong instead of Makefile.
Test: make out/soong/.intermediates/frameworks/base/hiddenapi-lists/android_common/private-dex.txt
Merged-In: Ifa912f8751025b7de24a982a1a227a9c27d18267
Change-Id: I80860c2b9f7213db65d0a9ca65bd645187aa0ce0
David Brazdil [Wed, 2 May 2018 08:42:49 +0000 (08:42 +0000)]
Merge "Publish hidden API light greylist from P"
android-build-prod (mdb) [Wed, 2 May 2018 02:41:39 +0000 (19:41 -0700)]
Merge changes from topic "ifaceStats"
am:
90c01b0093
Change-Id: I0b564b2d3b13c0e5d033c5cf4aaddad3a750f2c7
Chenbo Feng [Wed, 2 May 2018 02:36:30 +0000 (19:36 -0700)]
Use eBPF map data for per iface stats
am:
dcc56783f5
Change-Id: I9d6b930c8bb20f0bffd8eecee56ea7d3081b6f54
android-build-prod (mdb) [Wed, 2 May 2018 01:19:23 +0000 (01:19 +0000)]
Merge changes from topic "ifaceStats"
* changes:
Remove the unused file parsing function
Use eBPF map data for per iface stats
Chenbo Feng [Tue, 1 May 2018 20:51:13 +0000 (13:51 -0700)]
Remove the unused file parsing function
With the new xt_bpf support for iface stats. We no longer need to parse
the per interface stats from /proc/net/dev. And since the old xt_qtaguid
code path also not depend on it, we can completly remove that helper
function since no caller is depending on it now.
Bug:
72111305
Test: runtest frameworks-net -c com.android.internal.net.NetworkStatsFactoryTest
Change-Id: Icb7eaeef0eeb9fdffd32a90316c76ee05bafffbe
Chenbo Feng [Wed, 18 Apr 2018 22:44:46 +0000 (15:44 -0700)]
Use eBPF map data for per iface stats
After adding the xt_bpf module and ifaceStatsMap, eBPF tool can now
support reading per interface data. So networkStatsFactory should move
away from parsing proc/net/dev and use the eBPF map stats instead.
Bug:
72111305
Test: atest com.android.server.net.NetworkStatsServiceTest
Change-Id: Ibcc6150d00835b3bd33af22a72e4a86e172581cf
Anton Hansson [Tue, 1 May 2018 17:32:50 +0000 (18:32 +0100)]
frameworks/base: Update a few more references to android.jar.
These files are moving. Update the paths so that the old files can be
deleted.
Bug:
77525052
Test: ./build for one of these scripts
Change-Id: Iacca1f1930d6a2614866f6503a2b4c1eba4d4018
Chalard Jean [Tue, 1 May 2018 04:17:21 +0000 (21:17 -0700)]
Merge "Let DnsManager fill in LinkProperties for private DNSes"
am:
59e139a767
Change-Id: Icd79a15c573a3bc2f371d724081e296eca2b236f
Chalard Jean [Tue, 1 May 2018 03:07:35 +0000 (03:07 +0000)]
Merge "Let DnsManager fill in LinkProperties for private DNSes"
android-build-prod (mdb) [Tue, 1 May 2018 02:52:35 +0000 (19:52 -0700)]
Merge changes Ie4709b6e,I57980ccb
am:
9b1c3e00bf
Change-Id: I2bd54c8b2beb0299adefd0eaa1c65ee4099c5d34
android-build-prod (mdb) [Tue, 1 May 2018 01:31:31 +0000 (01:31 +0000)]
Merge changes Ie4709b6e,I57980ccb
* changes:
com.android.nfc_extras is built with java_sdk_library
Fix link-type check warning on com.android.nfc_extras
android-build-prod (mdb) [Mon, 30 Apr 2018 22:06:46 +0000 (15:06 -0700)]
Merge "Get/Set IO capability of Bluetooth device"
am:
d1ed784438
Change-Id: I54ae0a715b758a0b05a31e89c43207ff59c853a6
Stanley Tng [Mon, 30 Apr 2018 21:57:40 +0000 (14:57 -0700)]
Merge "Disable Hearing Aid Profile for all platforms except Pixels"
am:
3f3cf58813
Change-Id: I89ccb8308b7472e782e924140ce4eab3a09d7dc0
android-build-prod (mdb) [Mon, 30 Apr 2018 20:37:46 +0000 (20:37 +0000)]
Merge "Get/Set IO capability of Bluetooth device"
Ajay Panicker [Mon, 30 Apr 2018 19:57:27 +0000 (12:57 -0700)]
Merge "Don't set Bluetooth volume when the Bluetooth stream changes"
am:
5528d0a9a6
Change-Id: I524f5fded23bb2f7a0dc0413092d1c6297410aa5
Stanley Tng [Mon, 30 Apr 2018 19:48:36 +0000 (19:48 +0000)]
Merge "Disable Hearing Aid Profile for all platforms except Pixels"
Ajay Panicker [Mon, 30 Apr 2018 18:06:15 +0000 (18:06 +0000)]
Merge "Don't set Bluetooth volume when the Bluetooth stream changes"
Stanley Tng [Wed, 25 Apr 2018 16:13:08 +0000 (09:13 -0700)]
Disable Hearing Aid Profile for all platforms except Pixels
Add code to selectively disable Hearing Aid Profile depending on the
config.xml file.
Note: Cherry-picked from internal branch.
Bug:
78142728
Test: Manual Pairing on various Pixel phones
Change-Id: I8094f1a1665647b026eb9601e032fb7fbb816ec6
(cherry picked from commit
a21efa58369b304e5ea818a3f8b1577f1fed3d02)
Pulkit Bhuwalka [Wed, 28 Mar 2018 20:51:43 +0000 (13:51 -0700)]
Get/Set IO capability of Bluetooth device
Creates the hidden BluetoothAdapter APIs which can be used to
control IO capability settings on the local Bluetooth device.
Bug:
36015413
Test: Used a test activity to control getting/setting the value and
attempting pairing.
Change-Id: Ibbfdc5ae5a1d56c6e3d003ab3bf5d095dcb583e4
(cherry picked from commit
6043b7b90a27a836241bfc05e71eb46ce04c66cf)
Shuo Qian [Fri, 27 Apr 2018 19:50:23 +0000 (12:50 -0700)]
Merge "Restore the OEM hook implementation and usage"
am:
093ade312d
Change-Id: I9f2f44e24c3b926609efa85cfb932d06422cc40c
Shuo Qian [Fri, 27 Apr 2018 18:39:20 +0000 (18:39 +0000)]
Merge "Restore the OEM hook implementation and usage"
Ajay Panicker [Fri, 27 Apr 2018 14:13:23 +0000 (07:13 -0700)]
Don't set Bluetooth volume when the Bluetooth stream changes
Don't restore the remembered volume whenever an Bluetooth A2DP stream
comes up or whenever Bluetooth AVRCP reports absolute volume support.
All Bluetooth volume memory will now be handled by Bluetooth.
Bug:
30602783
Test: See that AudioService doesn't try to change the volume when a
Bluetooth device connects.
Change-Id: I683062c1a0565591ae33cbbb0381730b86ad17c2
android-build-prod (mdb) [Fri, 27 Apr 2018 07:56:10 +0000 (00:56 -0700)]
Merge "Add the list of private DNS addresses to LinkProperties"
am:
1100e84175
Change-Id: I76ec108862edfb557496ddcd8b5c73202cd674de
Jiyong Park [Wed, 25 Apr 2018 11:05:48 +0000 (20:05 +0900)]
com.android.nfc_extras is built with java_sdk_library
Remove the biolerplate code using java_sdk_library module type.
Bug:
77575606
Test: m -j
Change-Id: Ie4709b6ebc18bc2e4e26137d4a097d734f4435fe
android-build-prod (mdb) [Fri, 27 Apr 2018 04:53:52 +0000 (04:53 +0000)]
Merge "Add the list of private DNS addresses to LinkProperties"
Chalard Jean [Wed, 11 Apr 2018 09:58:52 +0000 (18:58 +0900)]
Let DnsManager fill in LinkProperties for private DNSes
(clean cherry-pick from ag/
3880157)
Test: new tests pass
Bug:
73641539
Change-Id: I971ef4d27b22a435d7459e1c4b31a8715ef6e610
Merged-In: I837df61e3c277ae08ebf4fdcd4c4e9ac8c550811
Merged-In: I72ecaa4f7d7320ffa2e0ba82fadafc947c8a6981
Chalard Jean [Wed, 11 Apr 2018 07:36:41 +0000 (16:36 +0900)]
Add the list of private DNS addresses to LinkProperties
(clean cherry-pick from ag/
3874803)
Test: atest android.net.LinkPropertiesTest, also new tests pass
Bug:
73641539
Change-Id: If33a35b1354a67db09411ff098f20064797296ad
Merged-In: I4b739c56e658690532ae9deb0b9a3bc9b2adf8b0
Merged-In: I6bdbef78d078d68534c8e07e9af031ce374560ef
Jiyong Park [Thu, 22 Feb 2018 07:04:02 +0000 (16:04 +0900)]
Fix link-type check warning on com.android.nfc_extras
The library has been built without SDK, and is used by an app
NfcExtrasTests that is built with SDK. Such this SDK -> non-SDK
dependency has been causing link-type check warnings, which will turn
into errors soon.
This change fixes the warning by making a stub library
com.android.nfc_extras.stubs from the runtime library and let the app to
link against the stub library. Since the stubs library does not use any
private APIs, it is built with SDK.
Bug:
69899800
Test: m -j NfcExtrasTests is successful and does not show any link-type
check warning.
Merged-In: I57980ccbc9036d7cc6df114a975a384d10a2962b
Change-Id: I57980ccbc9036d7cc6df114a975a384d10a2962b
(cherry picked from commit
ded4fd729b50d5298e77199194996d22d3b573cf)
android-build-prod (mdb) [Fri, 27 Apr 2018 02:20:21 +0000 (19:20 -0700)]
Merge "Fix carrier app CaptivePortalLoginActivity probes to bypass Private DNS"
am:
8e386b7132
Change-Id: I11062b03de5e02e87598fd5312e01e9695cecc35
Shuo Qian [Fri, 27 Apr 2018 01:27:02 +0000 (01:27 +0000)]
Restore the OEM hook implementation and usage
The current plan is to keep the OEM hook implementation in the framework
, this is for legacy device and old device upgrading (per b/
78098059).
For P launching device, the OEM hook service is removed in hal, so the
OEM hook api in framework should return something dummy, and prevent
infinite loop to get service, but these parts should be done in seperate
CLs after this restore CL is merged.
This reverts commit
f09bde2809b4eb34fb68d0935f8b963fb6a9fcde.
Bug:
34344851
Change-Id: I2aea9be9aa7cecd4f7a1f1783391f0af173bfc59
Test: pass Treehugger tests; pass cuttlefish test RilE2eTests
Merged-In: I1f2117331a7f846b192c5f956f3841d58cb8154b
android-build-prod (mdb) [Fri, 27 Apr 2018 01:10:49 +0000 (01:10 +0000)]
Merge "Fix carrier app CaptivePortalLoginActivity probes to bypass Private DNS"
Mika Raento [Thu, 26 Apr 2018 18:12:53 +0000 (11:12 -0700)]
Merge "Systrace support for NNAPI"
am:
ecb0302ae9
Change-Id: I16dbb15a6139105b7e04761cdbcffff32b8b1706
Mika Raento [Thu, 26 Apr 2018 17:01:32 +0000 (17:01 +0000)]
Merge "Systrace support for NNAPI"
David Brazdil [Thu, 26 Apr 2018 16:06:17 +0000 (17:06 +0100)]
Publish hidden API light greylist from P
This will be periodically updated from the internal tree. The file
is not being used anywhere.
Test: N/A
Change-Id: Ie0587d82afe5daf0276914f888542711d3f3baa5
David Brazdil [Thu, 26 Apr 2018 13:40:43 +0000 (06:40 -0700)]
Merge "Generate @removed DEX API signatures"
am:
eddd165c20
Change-Id: Iff6c84e82f5127ba896dd838952e86facef58fd7
David Brazdil [Thu, 26 Apr 2018 12:39:41 +0000 (12:39 +0000)]
Merge "Generate @removed DEX API signatures"
Mika Raento [Mon, 23 Apr 2018 21:08:57 +0000 (22:08 +0100)]
Systrace support for NNAPI
Change-Id: Ie73d28937eba33e2d90f1447f17fd6d8e5719a65
Bug:
78137932
Test: mm
Erik Kline [Thu, 26 Apr 2018 05:31:56 +0000 (22:31 -0700)]
Merge "Fix CaptivePortalLoginActivity probes to bypass Private DNS"
am:
ec629e2f43
Change-Id: Ieca1a7b245f08b71e56deaaea870f6dd6c6844c4
Erik Kline [Thu, 26 Apr 2018 03:04:40 +0000 (12:04 +0900)]
Fix carrier app CaptivePortalLoginActivity probes to bypass Private DNS
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
64133961
Bug:
77140445
Bug:
78548486
Change-Id: I48c60fd6711dcf5406fba62a3f88aea12183ff87
Erik Kline [Thu, 26 Apr 2018 04:15:20 +0000 (04:15 +0000)]
Merge "Fix CaptivePortalLoginActivity probes to bypass Private DNS"
Erik Kline [Wed, 25 Apr 2018 08:27:28 +0000 (17:27 +0900)]
Fix CaptivePortalLoginActivity probes to bypass Private DNS
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- manual testing on captive portal networks
Bug:
64133961
Bug:
77140445
Bug:
78548486
Change-Id: Idbc4d90eeec257b36c5f374d61dea4600a0f8ebb
Shuo Qian [Wed, 25 Apr 2018 20:45:57 +0000 (13:45 -0700)]
Merge "Revert "Revert "Remove the OEM hook implementation and usage"""
am:
b686b9cf6d
Change-Id: I3a8142c55cc0e921d84d87137bb849077197b7ac
Shuo Qian [Wed, 25 Apr 2018 19:31:54 +0000 (19:31 +0000)]
Merge "Revert "Revert "Remove the OEM hook implementation and usage"""
Shuo Qian [Tue, 24 Apr 2018 19:04:19 +0000 (19:04 +0000)]
Revert "Revert "Remove the OEM hook implementation and usage""
This reverts commit
00b89515a54b7f8d635408994c6384fb80fe2127.
Change-Id: I61c5d47fabf760bfefe843fb7a31f0a481c94c50
Merged-In: Icb06aea5eb42fd156a967c4d4e39aefc51d91cf4
Jack Yu [Wed, 25 Apr 2018 00:31:23 +0000 (17:31 -0700)]
Merge "Fixed the document of getNetworkCountryIso"
am:
8252157aca
Change-Id: I6d4c5183d525a36bf1f1cee7fd034772427a3d32
Treehugger Robot [Tue, 24 Apr 2018 23:02:38 +0000 (23:02 +0000)]
Merge "Fixed the document of getNetworkCountryIso"
Tyler Gunn [Tue, 24 Apr 2018 16:52:26 +0000 (09:52 -0700)]
Merge "Add ability to log last 2 digits of dialed numbers in userdebug builds."
am:
a355552bfe
Change-Id: Id58f0268fd6e5a3611b2dc27d456b13fb8dcee6a
Tyler Gunn [Tue, 24 Apr 2018 15:33:29 +0000 (15:33 +0000)]
Merge "Add ability to log last 2 digits of dialed numbers in userdebug builds."
David Brazdil [Tue, 24 Apr 2018 15:27:53 +0000 (16:27 +0100)]
Generate @removed DEX API signatures
CL I8fe27e8c03334f9c90204db1e69447de65a06a38 adds support to generate
a list of all @removed DEX API signatures. Amend the public API build
rule to produce this file.
Bug:
78182899
Test: make
Change-Id: Iba8869ce6e4f401a8e420ad83ab459d25bbbaae0
Nathan Harold [Tue, 24 Apr 2018 05:11:58 +0000 (22:11 -0700)]
Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE"
am:
238eaf5183
Change-Id: Id49766c04ddfe89a28c37360c35959ff2a4a329a
Treehugger Robot [Tue, 24 Apr 2018 03:56:40 +0000 (03:56 +0000)]
Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE"
Andreas Gampe [Tue, 24 Apr 2018 00:24:58 +0000 (17:24 -0700)]
Merge "PackageManager: Skip dexopt on install for debuggable apps"
am:
5faf7291f0
Change-Id: I5cd62f4ac85dc16c1ff00233096b3b6ec60a3db2
Treehugger Robot [Mon, 23 Apr 2018 22:35:17 +0000 (22:35 +0000)]
Merge "PackageManager: Skip dexopt on install for debuggable apps"
Anton Hansson [Mon, 23 Apr 2018 22:21:58 +0000 (15:21 -0700)]
Merge "Move frameworks/base off the SRC_API_DIR variable."
am:
2a4277fb00
Change-Id: I7912e0aec15b478cff139c8312893d418c360ef2
Hansong Zhang [Mon, 23 Apr 2018 21:25:27 +0000 (14:25 -0700)]
Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF"
am:
361ab2c581
Change-Id: I38d9e8258a0ebab18c1e8565f5b4a0a12baa3deb
Jack Yu [Mon, 23 Apr 2018 18:08:23 +0000 (11:08 -0700)]
Fixed the document of getNetworkCountryIso
Test: Build
Bug:
64335394
Change-Id: Ic8fc41380e15a40f9498c990b0074571cdffd018
Anton Hansson [Mon, 23 Apr 2018 20:16:57 +0000 (20:16 +0000)]
Merge "Move frameworks/base off the SRC_API_DIR variable."
Treehugger Robot [Mon, 23 Apr 2018 20:01:02 +0000 (20:01 +0000)]
Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF"
Hansong Zhang [Mon, 23 Apr 2018 18:17:17 +0000 (11:17 -0700)]
BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF
Add dumpsys logs for state transition from BLE_ON to OFF. This can be
either from location settings off or airplane mode enabled.
Test: manual
Bug:
74090881
Change-Id: I1f6cfe691b359591af60c3be2e015bec5d3859e8
Andreas Gampe [Mon, 23 Apr 2018 15:59:12 +0000 (08:59 -0700)]
PackageManager: Skip dexopt on install for debuggable apps
To reduce install-to-started latency, skip dexopt at install-time
for debuggable apps. This is a conscious tradeoff, as the app
will run slower, and do repeated work on every startup. However,
for debuggable apps, turnaround time is more important.
Bug:
78200989
Test: m
Test: Device boots
Test: CTS (wrap & JVMTI)
Change-Id: I749934e794b0c89d72ea8ee413b845e7804de184
Tyler Gunn [Mon, 23 Apr 2018 16:52:25 +0000 (09:52 -0700)]
Add ability to log last 2 digits of dialed numbers in userdebug builds.
Filers of bugs often refer to specific phone numbers. Bug reports by
default obscure dialed phone numbers from the Telecom logs. This makes it
difficult to relate events in the bug report to what the bug filer refers
to.
To ease this, in userdebug builds we will now leave the last 2 digits of
dialed phone numbers un-obfuscated. User builds will remain obfuscated.
Test: Added unit tests to cover this case.
Bug:
78457192
Change-Id: I52704cf57ed11b1fa53a55bc883d7d090af661f4
Anton Hansson [Thu, 19 Apr 2018 15:23:53 +0000 (16:23 +0100)]
Move frameworks/base off the SRC_API_DIR variable.
This directory is going away. Migrate to the new paths, and replace the
long list of "since" arguments with a loop in the makefile. Also fix the
soong buildfile to use the new path and the 28 prebuilts.
This removes the need to update it every time an API is finalized (in make,
I don't know how to make loops in soong).
Bug:
77525052
Test: Verified variable is the same before & after, except for path change
Change-Id: I1d4e87e7840e979b83779a2aefe176e7c1ed1527
Merged-In: I1d4e87e7840e979b83779a2aefe176e7c1ed1527
Jack Yu [Mon, 23 Apr 2018 06:47:27 +0000 (23:47 -0700)]
Merge "Set country code even when device is not registered on network"
am:
fc9bc10d69
Change-Id: If3f257f00bcc4147e7d4cc85fdfe03b00b319d76
Treehugger Robot [Mon, 23 Apr 2018 05:48:18 +0000 (05:48 +0000)]
Merge "Set country code even when device is not registered on network"
Jack Yu [Fri, 13 Apr 2018 21:05:32 +0000 (14:05 -0700)]
Set country code even when device is not registered on network
Extends the functionality of getNetworkCountryIso to support
no SIM/no service case. When no SIM/no service, it returns
the country code of nearby network (unregistered but cell info
is available to the device).
Test: Manual
Bug:
64335394
Merged-In: Ia32cbc9df9b9adf5d7c24c8b90be20063a94a514
Change-Id: Ia32cbc9df9b9adf5d7c24c8b90be20063a94a514
(cherry picked from commit
ac36896f1aa90ef21cd23bd213674a01f68f48d3)
Tobias Lindskog [Fri, 20 Apr 2018 18:35:18 +0000 (11:35 -0700)]
Merge "Catch double unbind of dead service"
am:
03cdc95f1c
Change-Id: I9ff4cb306e807d769a1dd5acca06a2703b666040
Treehugger Robot [Fri, 20 Apr 2018 17:14:39 +0000 (17:14 +0000)]
Merge "Catch double unbind of dead service"
Tobias Lindskog [Mon, 12 Mar 2018 14:44:47 +0000 (15:44 +0100)]
Catch double unbind of dead service
If a service receives onBindingDied after it has successfully connected
once, unbindService would be called once from the onBindingDied and then
again from registerServiceLocked when the service was rebound. This
second attempt would typically crash.
The first unbindService call has a try/catch, add one around the second
call as well.
Test: Manual. Boots and reboots without problems.
Change-Id: Ie9eabbcb6ee89c05abc565427465cfd6906f3fa3
Bernie Innocenti [Fri, 20 Apr 2018 02:57:40 +0000 (19:57 -0700)]
Merge "apf: Add immediate encoding tests for LI"
am:
9ee5bb0037
Change-Id: I1fa1423342efc4af8cf68a512b6ffe05a3c07f8b
Treehugger Robot [Fri, 20 Apr 2018 01:09:33 +0000 (01:09 +0000)]
Merge "apf: Add immediate encoding tests for LI"
Pavlin Radoslavov [Fri, 20 Apr 2018 00:59:36 +0000 (17:59 -0700)]
Merge "Fix the implementation of BluetoothCodecStatus.equals()"
am:
3a1ca762c9
Change-Id: I159c2128068021b5ca5e0a7bf3eae218de0bdf1b
Treehugger Robot [Thu, 19 Apr 2018 23:55:31 +0000 (23:55 +0000)]
Merge "Fix the implementation of BluetoothCodecStatus.equals()"
Pavlin Radoslavov [Thu, 19 Apr 2018 21:16:15 +0000 (14:16 -0700)]
Fix the implementation of BluetoothCodecStatus.equals()
Previously, the BluetoothCodecStatus.equals() implementation
was incorrect when comparing arrays of capabilities.
In the new implementation, the arrays are compared correctly,
and also the ordering of the capabilities in each array is ignored.
Also, added unit tests for class BluetoothCodecConfig and class
BluetoothCodecStatus.
Bug:
73404858
Bug:
73379307
Test: Unit tests (in frameworks/base)
runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecConfigTest.java
runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecStatusTest.java
Change-Id: If22087465397b7c4175c33f7d1909a15d957fb24
Cassie Han [Thu, 19 Apr 2018 20:54:12 +0000 (13:54 -0700)]
Merge "Cherry-pick 'Fix a tiny bug in NetworkScanRequest'"
am:
122a7b33ad
Change-Id: I5acb34ef6d16fd5eab73951811d220049b60a988
Cassie Han [Thu, 19 Apr 2018 19:23:58 +0000 (19:23 +0000)]
Merge "Cherry-pick 'Fix a tiny bug in NetworkScanRequest'"
Bernie Innocenti [Thu, 19 Apr 2018 14:25:11 +0000 (07:25 -0700)]
Merge "Adjust APF interpreter tests to match APFv4"
am:
05011abf27
Change-Id: I5ca2b41ab6c101bef7465229270079c81743c757
Bernie Innocenti [Thu, 19 Apr 2018 11:53:00 +0000 (20:53 +0900)]
apf: Add immediate encoding tests for LI
This tests that ApfGenerator knows how to optimally encode positive and
negative immediates of various sizes.
Equivalent tests will follow for LDDW and STDW.
Change-Id: Ia904aecb155c78569e3cf32a2431570281570481
Bug:
73804303
Test: runtest tests/net/java/android/net/apf/ApfTest.java
Bernie Innocenti [Thu, 19 Apr 2018 13:17:20 +0000 (13:17 +0000)]
Merge "Adjust APF interpreter tests to match APFv4"
Erik Kline [Thu, 19 Apr 2018 12:15:13 +0000 (05:15 -0700)]
Merge "Actually resolve all IPs for Private DNS hostname"
am:
5ace372bc2
Change-Id: I83ffc854b60f2beb0a9e4c8a107ce26b656c935e
Treehugger Robot [Thu, 19 Apr 2018 11:02:29 +0000 (11:02 +0000)]
Merge "Actually resolve all IPs for Private DNS hostname"
Erik Kline [Thu, 19 Apr 2018 08:58:15 +0000 (17:58 +0900)]
Actually resolve all IPs for Private DNS hostname
Previously, we reused the OneAddressPerFamilyNetwork which does
what it says on the tin. For the resolution that will be used
to program netd this is not what we really want.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- manual testing of Private DNS passes
Bug:
64133961
Change-Id: Ieccc4d208b314b81061dc78d83848f97acefe04b
Nan Zhang [Wed, 18 Apr 2018 21:51:30 +0000 (14:51 -0700)]
Merge "Migrate android_uiautomator generation to Soong."
am:
0e5b92eea6
Change-Id: I39fb52030ec03bbe2e9be7e296a9291fbd3184e4
Cassie [Tue, 17 Apr 2018 16:20:08 +0000 (09:20 -0700)]
Cherry-pick 'Fix a tiny bug in NetworkScanRequest'
Bug:
77487847
Test: cts-tradefed run cts -m CtsCarrierApiTestCases --test android.carrierapi.cts.NetworkScanApiTest
Change-Id: Ic4b167cf4929a1bb86fa7e6768672a9288b96911
Merged-In: Ic4b167cf4929a1bb86fa7e6768672a9288b96911
Treehugger Robot [Wed, 18 Apr 2018 20:17:54 +0000 (20:17 +0000)]
Merge "Migrate android_uiautomator generation to Soong."
Nan Zhang [Fri, 13 Apr 2018 22:58:29 +0000 (15:58 -0700)]
Migrate android_uiautomator generation to Soong.
Bug: b/
70351683
Test: m clean && m android_uiautomator
and compare the old and new stubs.jar using md5sum.
Change-Id: I01937352ae1a470745f2ab1a9acbb4ea9520e153
Merged-In: I01937352ae1a470745f2ab1a9acbb4ea9520e153
luochaojiang [Wed, 18 Apr 2018 14:05:23 +0000 (07:05 -0700)]
Merge "Stop InCall Notification to avoid track leak"
am:
b47c9019b5
Change-Id: I1bf6b52a8a82ddc5880871344a8f5af53ebf8322
Treehugger Robot [Wed, 18 Apr 2018 12:53:30 +0000 (12:53 +0000)]
Merge "Stop InCall Notification to avoid track leak"
tiansiming [田思明] [Wed, 18 Apr 2018 05:20:18 +0000 (22:20 -0700)]
Merge "Remove duplicated code in IMMS"
am:
5ab0fe1f56
Change-Id: I6311c39ee5ea9abfa5b025315968d122f0d3f694
Treehugger Robot [Wed, 18 Apr 2018 04:09:28 +0000 (04:09 +0000)]
Merge "Remove duplicated code in IMMS"
Shuo Qian [Wed, 18 Apr 2018 02:57:45 +0000 (19:57 -0700)]
Merge "Revert "Remove the OEM hook implementation and usage""
am:
e7a099149f
Change-Id: Idb6e70da6b33f25d1cdce8ed5ed4b845b6237648
Shuo Qian [Wed, 18 Apr 2018 01:39:43 +0000 (01:39 +0000)]
Merge "Revert "Remove the OEM hook implementation and usage""
luochaojiang [Mon, 16 Apr 2018 08:55:03 +0000 (16:55 +0800)]
Stop InCall Notification to avoid track leak
There is no ringtone when a call is in comming. The audio track is
out of limit, for the notification tone can not be recycled timely.
Here is the steps to reproduce this issue.
1. Call the test device and keep it in communication
2. Send message to test device, more than 15 messages.
3. Stop call on test device, re-call the test device.
4. This is no ringtone now, if not, re try the previous steps.
Test: make, take a photo, record a video and play video
Change-Id: Iba4a41d7b8b601fa500b8a60cadaf04651f37fed
Signed-off-by: luochaojiang <luochaojiang@xiaomi.com>
tiansiming [田思明] [Tue, 17 Apr 2018 10:15:33 +0000 (18:15 +0800)]
Remove duplicated code in IMMS
There is no need to judge mIsInteractive again
Bug: N/A
Test: N/A
Change-Id: I887b5fdd16e4c39ff2dcf13902dfed69741635f8
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com>
Daniel Bonnevier [Tue, 17 Apr 2018 21:03:13 +0000 (14:03 -0700)]
Merge "Correct sendBroadcast test"
am:
1cb379b782
Change-Id: Ic533da3300a2227f8b9b002fe305daed27beea38