OSDN Git Service
George Burgess IV [Wed, 6 Jun 2018 02:17:16 +0000 (19:17 -0700)]
Merge "Fix a 'memory leak'"
am:
38e7338d92
Change-Id: Ie6670cd3f6fe1405859d75d2454ec6894f5c5913
Treehugger Robot [Tue, 5 Jun 2018 23:29:10 +0000 (23:29 +0000)]
Merge "Fix a 'memory leak'"
Ruchi Kandoi [Tue, 5 Jun 2018 23:14:32 +0000 (16:14 -0700)]
Merge "Suppress AID log on adb logcat"
am:
e72aecb655
Change-Id: Ib2acf51fbaf4d1c23d0629a0b8538f3fdb6d313a
Ruchi Kandoi [Tue, 5 Jun 2018 20:56:35 +0000 (20:56 +0000)]
Merge "Suppress AID log on adb logcat"
Erik Kline [Tue, 5 Jun 2018 10:08:53 +0000 (03:08 -0700)]
Merge "Randomize the local Wifi IPv4 address"
am:
13cb6084e2
Change-Id: I2aa4170c8f0b277d6c6e3489012c3698ab3d3229
Treehugger Robot [Tue, 5 Jun 2018 08:11:20 +0000 (08:11 +0000)]
Merge "Randomize the local Wifi IPv4 address"
Erik Kline [Tue, 29 May 2018 10:24:43 +0000 (19:24 +0900)]
Randomize the local Wifi IPv4 address
Also: address a few "error prone" warnings, adding @Override where missing
Test: as follows
- built, flashed, booted
- runtest frameworks-net passes (with --no-hidden-api-checks)
- wifi tethering uses a randomized address, in as much as it can work
Bug:
32163131
Bug:
70673901
Change-Id: Icfabc48f2cf97b362ce292747f47021e84b900da
Bernie Innocenti [Tue, 5 Jun 2018 05:53:58 +0000 (22:53 -0700)]
Merge "vpn: allow IPSec traffic through Always-on VPN"
am:
4d3b5c1d3b
Change-Id: I90fbe3ad3ec8b9d3b52e6036ae07dd8db814cb22
Treehugger Robot [Tue, 5 Jun 2018 04:35:55 +0000 (04:35 +0000)]
Merge "vpn: allow IPSec traffic through Always-on VPN"
Yu Jia [Tue, 5 Jun 2018 02:34:00 +0000 (19:34 -0700)]
Merge "cts case com.android.server.cts.GraphicsStatsValidationTest#testDaveyDrawFrame in modue CtsIncidentHostTestCases failed"
am:
2dd3d8cbef
Change-Id: I37d35302041a8759eae91e616fa6f3d5c7fdf401
Treehugger Robot [Tue, 5 Jun 2018 01:15:16 +0000 (01:15 +0000)]
Merge "cts case com.android.server.cts.GraphicsStatsValidationTest#testDaveyDrawFrame in modue CtsIncidentHostTestCases failed"
Erik Kline [Mon, 4 Jun 2018 17:36:28 +0000 (10:36 -0700)]
Merge "Clear IPv4 address on tethering teardown."
am:
86e94acfa4
Change-Id: Ibea385035880e971445b10d814d04c7419d3aaff
Erik Kline [Mon, 4 Jun 2018 17:26:40 +0000 (10:26 -0700)]
Merge "Send empty LinkProperties when entering StoppedState."
am:
59ccf1041f
Change-Id: I0405006d15bc5d05d09202fa9dbc81989a9c0717
Sundong Ahn [Mon, 4 Jun 2018 17:14:24 +0000 (10:14 -0700)]
Merge "com.android.media.tv.remoteprovider is built with java_sdk_library"
am:
bd83ac0ecc
Change-Id: I5f786115b1a81a6505e473dc51e82b6b14037d22
Treehugger Robot [Mon, 4 Jun 2018 09:45:25 +0000 (09:45 +0000)]
Merge "Clear IPv4 address on tethering teardown."
Erik Kline [Fri, 18 May 2018 07:09:24 +0000 (16:09 +0900)]
Clear IPv4 address on tethering teardown.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- wlan0 in STA mode, wlan1 up/down in AP mode
no lingering IPv4 mode
- USB tethering up/down works
- bluetooth tethering yields:
05-18 17:50:49.726 719 756 D TetherController: untetherInterface(bt-pan)
05-18 17:50:49.729 1194 1230 E Tethering: [bt-pan] ERROR Failed to clear IPv4 address on interface bt-pan: java.lang.IllegalStateException: command '224 interface setcfg bt-pan 0.0.0.0 0' failed with '400 224 Failed to clear address (No such device)'
which is acceptable (no actual crash, just a log message)
Bug:
79905644
Merged-In: Ie898adc4efbb7376f0297abacdfe39c8700f0722
Merged-In: I9eb44eaf4e99fa85fff2909524ee88673bdcf1fd
Merged-In: Iaf29788a6692d810f3160e3f21d06b7452ecbaa6
(cherry picked from commit
472276a874316b725027098b79e1c9f03c62cad2)
Change-Id: Icb5c4f7971af4715c7662f80194b4c1ce369a135
Erik Kline [Mon, 4 Jun 2018 07:41:51 +0000 (07:41 +0000)]
Merge "Send empty LinkProperties when entering StoppedState."
Bernie Innocenti [Mon, 28 May 2018 13:04:37 +0000 (22:04 +0900)]
vpn: allow IPSec traffic through Always-on VPN
This won't leak any traffic outside the VPN as long as there are no
processes owned by uid 0 which generate network traffic (which is
currently the case).
Bug:
69873852
Test: compared the output of 'adb shell ip rule show' before and after
Test: runtest -x frameworks/base/tests/net/java/com/android/server/connectivity/VpnTest.java
Test: local CTS tests run: android.net.cts.VpnServiceTest
Test: local CTS tests run: com.android.cts.devicepolicy.MixedDeviceOwnerTest
Change-Id: I8758e576c9d961d73f62bfcf0559dd7ecee6e8e6
Treehugger Robot [Mon, 4 Jun 2018 04:54:27 +0000 (04:54 +0000)]
Merge "com.android.media.tv.remoteprovider is built with java_sdk_library"
Pavel Maltsev [Fri, 1 Jun 2018 18:28:04 +0000 (11:28 -0700)]
Merge "Fix comments to reflect changes in eth service"
am:
1f392c468a
Change-Id: I542f43603ef19387c57b74cdadf0900548256c39
Treehugger Robot [Fri, 1 Jun 2018 17:21:27 +0000 (17:21 +0000)]
Merge "Fix comments to reflect changes in eth service"
Akinobu Nakashima [Fri, 1 Jun 2018 07:35:10 +0000 (16:35 +0900)]
Suppress AID log on adb logcat
When NFC event transaction intent is sent,
the device shows AID information on logcat.
But such information should not be shown for security reasons.
Test: Send NFC EventTransaction and check logcat
Bug:
80551185
Change-Id: I8d1f9c1946bb1514e3a6bfa70fff03be4525d6b5
Colin Cross [Fri, 1 Jun 2018 00:38:48 +0000 (17:38 -0700)]
Merge "Add support for --replace-version to aapt2"
am:
186be90eb6
Change-Id: I6397623d883af229a8941bd26a084d09d40f48c9
Hall Liu [Fri, 1 Jun 2018 00:33:55 +0000 (17:33 -0700)]
Merge "Fix MbmsDownloadSession documentation"
am:
bb2ce1010e
Change-Id: Ibe39e6526e7cc89dc95eac90fcb0a431938ca307
Eeshan Shrimali [Fri, 1 Jun 2018 00:23:12 +0000 (17:23 -0700)]
Merge "DCB whitelist shortcode for user association"
am:
b17d1962b7
Change-Id: I802a1ecd1ff23e15860ed03e22491476aec2d3ed
Colin Cross [Thu, 31 May 2018 22:53:37 +0000 (22:53 +0000)]
Merge "Add support for --replace-version to aapt2"
Hall Liu [Thu, 31 May 2018 21:16:05 +0000 (21:16 +0000)]
Merge "Fix MbmsDownloadSession documentation"
Brad Ebinger [Thu, 31 May 2018 19:10:05 +0000 (12:10 -0700)]
Merge "IMS: Support for Implicit Call Rejection"
am:
19d032b695
Change-Id: Ic0238e05ea2682ded8420f739834df94db7c7222
Treehugger Robot [Thu, 31 May 2018 19:01:32 +0000 (19:01 +0000)]
Merge "DCB whitelist shortcode for user association"
Pavel Maltsev [Wed, 30 May 2018 19:31:21 +0000 (12:31 -0700)]
Fix comments to reflect changes in eth service
OEMs should be able to set gateway, DNS and domain for their static IP
configuration.
Cherry picked without conflicts.
Bug:
80090920
Test: m
Merged-in: Id7b6d538e2551cbd188821feb4b4feb102e4c751
(cherry picked from commit
d6b0780628bf4f758fd68534b4ecdf2da0fe2a7f)
Change-Id: I347a91e202fb6d6f1ae893c097c7d2e8856a3593
Hall Liu [Wed, 30 May 2018 23:11:11 +0000 (16:11 -0700)]
Fix MbmsDownloadSession documentation
Fix the TODO from forever ago and update the docs for the listener
registration methods.
Change-Id: I1276d0afe430e1b50c0af1fdfacb12a89ea5aa38
Fixes:
80493663
Test: None, comments only
Remi NGUYEN VAN [Thu, 31 May 2018 17:27:22 +0000 (10:27 -0700)]
Merge "Add missing dependencies for libdexfile"
am:
286aa939af
Change-Id: Icde98a98d4d2dbeeab8ea058dd5168c510494eaf
Brad Ebinger [Thu, 31 May 2018 16:45:20 +0000 (16:45 +0000)]
Merge "IMS: Support for Implicit Call Rejection"
Remi NGUYEN VAN [Thu, 31 May 2018 02:23:17 +0000 (02:23 +0000)]
Merge "Add missing dependencies for libdexfile"
Omkar Kolangade [Mon, 2 Apr 2018 19:54:00 +0000 (12:54 -0700)]
IMS: Support for Implicit Call Rejection
Adding an API in MmTelFeature to allow IMS
Service to report the reasons for implicit
call rejections by lower layers. Corresponding
ImsReasonInfo codes are also being added.
The call rejections are not related to any
call session or a call that Framework is aware
of.
Change-Id: Ie47a239856db21e84d199a7620edf7b6ceeb81bc
Colin Cross [Sat, 26 May 2018 05:46:35 +0000 (22:46 -0700)]
Add support for --replace-version to aapt2
Implement --replace-version to match aapt1.
Bug:
79755007
Test: aapt2_tests
Change-Id: Iee2bd9a3981c7d4681509f18b735c6e9e6c1a336
Merged-In: Iee2bd9a3981c7d4681509f18b735c6e9e6c1a336
(cherry picked from commit
dcd58c420771af75c625242985bd96ba828aca56)
Hall Liu [Wed, 30 May 2018 22:09:21 +0000 (15:09 -0700)]
Merge "Add CallAudioState ctor as TestApi"
am:
39ac9ffe27
Change-Id: I7ecc3c81927b58bddb5ae12f254be0c09133672a
Chenbo Feng [Wed, 30 May 2018 22:05:08 +0000 (15:05 -0700)]
Merge "Check for bpf support at NetworkStatsService start"
am:
0defa6e72c
Change-Id: Ia2b5c8c7b7185787fee57281727b366752ef887f
Hall Liu [Wed, 30 May 2018 20:24:34 +0000 (20:24 +0000)]
Merge "Add CallAudioState ctor as TestApi"
Treehugger Robot [Wed, 30 May 2018 19:54:42 +0000 (19:54 +0000)]
Merge "Check for bpf support at NetworkStatsService start"
Chenbo Feng [Sat, 19 May 2018 00:10:07 +0000 (17:10 -0700)]
Check for bpf support at NetworkStatsService start
The current implementation check for bpf map existance whenever a
NetworkStats request comes in. The check is not efficient and may
require additional permission for threads. So a member variable is added
to NetworkStatsService to store the bpf configuration status and is
initialized when NetworkStatsService start.
Test: -m CtsNetTestCases -t android.net.cts.TrafficStatsTest
-m CtsUsageStatsTestCases -t android.app.usage.cts.NetworkUsageStatsTest
Bug:
79994577
Change-Id: I872ae18fb3e9631a4e6c4d773fefbba32e60a03b
Merged-In: I872ae18fb3e9631a4e6c4d773fefbba32e60a03b
Colin Cross [Wed, 30 May 2018 06:21:55 +0000 (23:21 -0700)]
Merge "Use AAPT2 for more modules with manifest validation errors"
am:
ce1979d707
Change-Id: If52a42d9f2a95d5d957b177e36a7a14fd54bace9
Yu Jia [Wed, 30 May 2018 03:18:05 +0000 (11:18 +0800)]
cts case
com.android.server.cts.GraphicsStatsValidationTest#testDaveyDrawFrame in
modue CtsIncidentHostTestCases failed
This cts case design 20 frames, every 4 frames include 700ms frame and
150ms frame
When activity launched, first 3 frames need allocate buffer during
dequeue buffer, bug some low-end platform took too long (>6ms), so
it will skip the fourth frame(150ms) and post a new draw callback that will cause cts failed
Colin Cross [Wed, 30 May 2018 05:01:08 +0000 (05:01 +0000)]
Merge "Use AAPT2 for more modules with manifest validation errors"
Remi NGUYEN VAN [Wed, 30 May 2018 04:52:08 +0000 (13:52 +0900)]
Add missing dependencies for libdexfile
Since a dependency was added to libartbase from libdexfile, this test
has been failing because of the missing deps. As discussed both
libartbase and its non-NDK dependencies need to be added.
Bug: b/
79785496
Bug: b/
80082746
Test: ApfTest and UidRangeTest now pass in master, still pass in aosp
Change-Id: Ia2c140514d7405d701c3ec520b77663abe2b34d5
Sundong Ahn [Wed, 30 May 2018 01:38:07 +0000 (18:38 -0700)]
Merge "Build java.obex with java_sdk_library"
am:
ad769993a9
Change-Id: I3a895f10880efb9ae916376f62d059941a25e417
Treehugger Robot [Wed, 30 May 2018 00:20:36 +0000 (00:20 +0000)]
Merge "Build java.obex with java_sdk_library"
Sundong Ahn [Fri, 18 May 2018 00:58:11 +0000 (09:58 +0900)]
Build java.obex with java_sdk_library
javax.obex is built with java_sdk_library and api files are added by
running "make update-api".
Remove java.obex is from platform.xml, since it will be generated
automatically by soong when the library is built with java_sdk_library.
Bug:
77577799
Test: make -j
make checkapi
Change-Id: Ib94955e62582ffbdfc7eb88cd0e494c61757c7aa
Tobias Thierer [Tue, 29 May 2018 13:38:18 +0000 (06:38 -0700)]
Merge "Track: Revert some needless differences vs upstream in Matcher.java"
am:
adb8532394
Change-Id: Iec1fc62d8e3fbc55f4a835bf664c908c9ec30b59
Tobias Thierer [Tue, 29 May 2018 12:11:58 +0000 (12:11 +0000)]
Merge "Track: Revert some needless differences vs upstream in Matcher.java"
Bernie Innocenti [Tue, 29 May 2018 03:35:33 +0000 (20:35 -0700)]
Merge "apf: Increase test coverage of LDDW / STDW"
am:
e03b8ee7e0
Change-Id: Ibc1a443c1c3a34edde835361e538a8d9cb8addb9
Treehugger Robot [Tue, 29 May 2018 02:33:22 +0000 (02:33 +0000)]
Merge "apf: Increase test coverage of LDDW / STDW"
zengjing [Mon, 28 May 2018 18:00:16 +0000 (11:00 -0700)]
Merge "Do not setForceUse when a2dp config without change"
am:
8a984b9f08
Change-Id: I644087265717458cb2ffa6bb20d29d90690c0022
Treehugger Robot [Mon, 28 May 2018 17:00:50 +0000 (17:00 +0000)]
Merge "Do not setForceUse when a2dp config without change"
Jorim Jaggi [Mon, 28 May 2018 11:59:24 +0000 (04:59 -0700)]
Merge "Do not call finishKeyguardDrawn with PWM's mlock"
am:
1c3681fe7c
Change-Id: I25a21fb44cddbbee9bc251d13a476a5d9fdfbe90
Jorim Jaggi [Mon, 28 May 2018 10:53:30 +0000 (10:53 +0000)]
Merge "Do not call finishKeyguardDrawn with PWM's mlock"
Erik Kline [Mon, 11 Dec 2017 05:24:08 +0000 (14:24 +0900)]
Send empty LinkProperties when entering StoppedState.
Additionally, no longer try to transition from within a State's
enter() method (this can encounter Log.wtf()s). Introduce some
CMD_JUMP_* commands and use deferMessage().
Test: as follows
- built, flashed, booted
- runtest -x IpClientTest passes
- basic DHCP wifi association works
Bug:
69800563
Bug:
70394432
Bug:
80284937
Change-Id: I7ed6e1a994a3556af345e8a4dfb51c383f6d5478
(cherry picked from commit
ffacb517d40df8ebb52d5906fa844b20c6520cd8)
Colin Cross [Fri, 18 May 2018 16:50:29 +0000 (09:50 -0700)]
Use AAPT2 for more modules with manifest validation errors
Add LOCAL_AAPT_FLAGS += --warn-manifest-validation to the modules
that have manifests that AAPT2 can't parse.
Bug:
79755007
Test: m checkbuild
Change-Id: I5f20ca582e481f7dac7b6a236662a2d1f47ea9fa
Tobias Thierer [Sat, 26 May 2018 15:20:20 +0000 (16:20 +0100)]
Track: Revert some needless differences vs upstream in Matcher.java
Android Matcher.start(int) declared "throws IllegalStateException",
which is correct but redundant. Upstream OpenJDK8u121-b13 does not
have this declaration. Another CL in this topic drops the declaration,
without changing behavior.
Bug:
35910877
Test: Treehugger
Change-Id: I59778f13f0df8bd4112af4edc25ee5a93084ae35
Hall Liu [Sat, 12 May 2018 00:14:08 +0000 (17:14 -0700)]
Add CallAudioState ctor as TestApi
Needed for CTS testing
Bug:
79528185
Test: CTS
Change-Id: Iad154257a93cc776d5800527e46e777fd6c88220
Merged-In: Iad154257a93cc776d5800527e46e777fd6c88220
Bryan Henry [Fri, 25 May 2018 21:42:16 +0000 (14:42 -0700)]
Merge "Allow changing signing cert for system apps that use shared users"
am:
f98f8a4c6c
Change-Id: Iccd2ec46ab087d2dc31afa255ea8dc9f49897b79
Bryan Henry [Fri, 25 May 2018 20:21:23 +0000 (20:21 +0000)]
Merge "Allow changing signing cert for system apps that use shared users"
Tetsutoki Shiozawa [Fri, 25 May 2018 18:01:09 +0000 (11:01 -0700)]
Merge "Fix: ConnectivityManager is initialized with a wrong context"
am:
4517eacd5d
Change-Id: I0629b33b8cc5e155b4500cc15901985dbf0a31f2
Treehugger Robot [Fri, 25 May 2018 16:42:59 +0000 (16:42 +0000)]
Merge "Fix: ConnectivityManager is initialized with a wrong context"
Tetsutoki Shiozawa [Mon, 19 Feb 2018 01:24:43 +0000 (10:24 +0900)]
Fix: ConnectivityManager is initialized with a wrong context
ActivityThread#setHttpProxy uses a system context to get
a ConnectivityManager instance. If it's not already cached, the
system service registry will cache this instance initialized
with the system context, and subsequent calls to get this service
will return the bad instance.
This patch uses the application context instead, unless it's
not available for some unlikely reason.
A possible symptom of this issue is to have Bluetooth tethering
failing with a security exception, because it's requested by
the "android" package without system uid.
Merged-In: Ib8815f010883cdb94fcad2cdfb237de39327b20a
Bug:
73572062
Change-Id: Id652c1625194dc73dcbf8dfcad4b4e2e6fbebf4e
Jiyong Park [Fri, 25 May 2018 11:17:49 +0000 (04:17 -0700)]
Merge changes from topic "location_provider"
am:
79b473ed7b
Change-Id: I9a9985fd18db00d510ebae9e0dec69d6647a2332
Treehugger Robot [Fri, 25 May 2018 10:04:43 +0000 (10:04 +0000)]
Merge changes from topic "location_provider"
* changes:
Remove FlpHardwareProvider
Create the stubs lib for com.android.location.provider
Rubin Xu [Fri, 25 May 2018 09:46:33 +0000 (02:46 -0700)]
Merge "Add permission check to setAllowOnlyVpnForUids"
am:
1fb2ed3de3
Change-Id: I3a529eecf98a19c8ab421707fc952b2a56e10f34
eddy-sh.chen [Fri, 25 May 2018 08:43:08 +0000 (16:43 +0800)]
Do not call finishKeyguardDrawn with PWM's mlock
Otherwise it may cause a deadlock between
PWM's mlock and WMS's mWindowMap.
Just post the work to the policy handler instead.
Bug:
80279029
Change-Id: Idae333687cf5c88e1893ee216c278b9e6c17dd98
Treehugger Robot [Fri, 25 May 2018 08:26:34 +0000 (08:26 +0000)]
Merge "Add permission check to setAllowOnlyVpnForUids"
Jiyong Park [Thu, 8 Mar 2018 07:43:07 +0000 (16:43 +0900)]
Remove FlpHardwareProvider
After Treble's FLP merge into GNSS HAL, the FlpHardwareProvider is just
an empty shell. Removing FusedLocation and/or Flp + Hardware classes
altogether.
Bug:
35726697
Test: m -j
Test: Open Google Map and then walk around. The dot moves as I walk.
Merged-In: I7f413e38b57424e8ebb9d7d14d94f145a48d10f8
Change-Id: I7f413e38b57424e8ebb9d7d14d94f145a48d10f8
(cherry picked from commit
4cc3a1c056f69ac4da1dc5055c36b7357e9f673c)
Jiyong Park [Tue, 27 Feb 2018 13:00:23 +0000 (22:00 +0900)]
Create the stubs lib for com.android.location.provider
com.android.location.provider.stubs is the stubs library for the shared
library com.android.location.provider. The stubs library is intended to
provide the stable set of APIs to the apps implementing location
provider.
Without the stubs library, apps had to directly link to the shared
library which is built without Android SDK and exposes private APIs that
are not intended to be used by apps. This also has been causing the
lin-type check warnings when the shared lib is used by apps built with
SDK; apps built with SDK is not allowed to link to lib built without
SDK. This has been reported as warnings but will soon be errors. Now
such apps are required to link to the stubs lib, which is built with
SDK.
While building the stubs library, following APIs are made hidden because
they are exposing private APIs from the Android platform.
1) Activity* classes are removed from the API, as they are not intended
to be used by apps since O.
2) GeocodeProvider and GeofenceProvider are removed from the API.
3) LocationProvider.mLocationManager is removed as it is exposing the
private symbol ILocationProvider
4) ProviderPropertiesUnbundle.getProviderProperties are removed from the
API as it is exposing the private symbol ProviderProperties.
5) The constructor of ProviderRequestUnbundled is removed since the
class is intended to be instantiated by the service.
Bug:
71420593
Test: m -j com.android.location.provider.stubs
Merged-In: I20aba7e9ca9c3adc75db241f37a55f0d657f3ced
Change-Id: I20aba7e9ca9c3adc75db241f37a55f0d657f3ced
(cherry picked from commit
eee99986c8021d6825f99a25434725fccf7b2b12)
Remi NGUYEN VAN [Fri, 25 May 2018 05:43:35 +0000 (22:43 -0700)]
Merge "Use AI_ADDRCONFIG for most DNS requests"
am:
b19a838f47
Change-Id: I452da6fffe8eddedf0082c8ca7602566c82f6ebe
Remi NGUYEN VAN [Fri, 25 May 2018 04:37:04 +0000 (21:37 -0700)]
Merge "Migrating remaining core networking tests to Junit4"
am:
96dbac0c5c
Change-Id: I3d5c8274f76d00c61a384213ade1fae97c96ae24
Remi NGUYEN VAN [Fri, 25 May 2018 03:28:05 +0000 (03:28 +0000)]
Merge "Use AI_ADDRCONFIG for most DNS requests"
Remi NGUYEN VAN [Fri, 25 May 2018 03:27:39 +0000 (03:27 +0000)]
Merge "Migrating remaining core networking tests to Junit4"
zengjing [Fri, 25 May 2018 03:15:20 +0000 (11:15 +0800)]
Do not setForceUse when a2dp config without change
When device connected with wired headset and without any bluetooth
connection, APP may call MediaRouter to setForceUse to set FOR_MEDIA
with FORCE_SPEAKER, then sound be output to SPEAKER. In this case,
if setBluetoothA2dpOn(false) was called, FOR_MEDIA will be set with
FORCE_NONE and sound be output to wird headset.
The issue discussed above occurred on our device. We developed an FM radio APP.
Beforce work, wired headset must be plugged in to be used as antennas. Then we
setForceUse FOR_MEDIA to FORCE_SPEAKER, and audio stream was output to speaker.
At this moment, if we play other sound (such as ScreenCapture sound),
MediaRouterService will detected audio playbacked state changed. Because FM Audio
was not monitor by AudioPlaybackMonitor, there was not any audio playback active.
So, restoreBluetoothA2dp was called in the function of onAudioPlayerActiveStateChanged,
which call AudioService.setBluetoothA2dpOn(false). As a result sound was switch to headset.
There are two solutions to fix our issue.
1) Check a2dp state before setBluetoothA2dpOn in MediaRouterService::restoreBluetoothA2dp,
if a2dp state does not change, setBluetoothA2dpOn should not be called
2) Check a2dp state before setForceUse in AudioService::setBluetoothA2dpOn,
if a2dp state does not change, setForceUse should not be called
Consdering that setBluetoothA2dpOn may be called by other method, we try to fix it
with the second one.
Test: NA
Change-Id: I3a2e64e7d73d9aa9539176fea556feb433cb7211
Signed-off-by: zengjing <zengjing@xiaomi.com>
Chih-Hung Hsieh [Thu, 24 May 2018 21:33:24 +0000 (14:33 -0700)]
Merge "Work around b/
24465209, do not pack relocation table."
am:
d01890df3c
Change-Id: If94d1d0587ad7314df416407c1ab4ad8dedc559a
Andreas Gampe [Thu, 24 May 2018 20:00:41 +0000 (13:00 -0700)]
Merge "Framework: Add API to get zygote PID"
am:
1109e2333f
Change-Id: I6f50efa61bcdec321cd71edae8a28881293c0398
Treehugger Robot [Thu, 24 May 2018 19:13:19 +0000 (19:13 +0000)]
Merge "Work around b/
24465209, do not pack relocation table."
Daisuke Teranishi [Thu, 24 May 2018 18:36:15 +0000 (11:36 -0700)]
Merge "Use correct filename when adding to ringtone"
am:
daff857ffd
Change-Id: If0d096e7b33c84522c11077df04407ecc224fcf1
David Brazdil [Thu, 24 May 2018 18:30:28 +0000 (11:30 -0700)]
Merge changes Id81271ff,I8f298371
am:
e7372ab0d5
Change-Id: I7e59da1705c22b6f9cb2b3bb78986fdb647716f7
David Brazdil [Thu, 24 May 2018 18:29:04 +0000 (11:29 -0700)]
[automerger skipped] DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt
am:
85c81cb24c -s ours
Change-Id: If9cfeeed5cfe1cc7511d540e5560f61356a080dd
Treehugger Robot [Thu, 24 May 2018 18:28:59 +0000 (18:28 +0000)]
Merge "Framework: Add API to get zygote PID"
Remi NGUYEN VAN [Thu, 24 May 2018 17:57:46 +0000 (10:57 -0700)]
Merge changes I3b3bcbbd,I18b3f263,I3c416c1a
am:
7b0935509d
Change-Id: I3bf92d8c1d1b4451b1af9dcb518b352ae40cc7ca
Treehugger Robot [Thu, 24 May 2018 16:55:49 +0000 (16:55 +0000)]
Merge "Use correct filename when adding to ringtone"
Chih-Hung Hsieh [Wed, 23 May 2018 04:37:08 +0000 (21:37 -0700)]
Work around b/
24465209, do not pack relocation table.
Global flag --pack-dyn-relocs=android is used with clang lld.
For b/
24465209, we need to override that with pack_relocations:false.
Bug:
24465209
Bug:
80093890
Test: build with USE_CLANG_LLD=true and run dlext.compat_elf_hash_and_relocation_tables
Change-Id: I9364feb4070d4f75705d8651d535c792fe6ad6f7
Erik Kline [Thu, 24 May 2018 14:39:50 +0000 (07:39 -0700)]
Merge "Fixup SntpClient to bypass Private DNS"
am:
a7183b92c4
Change-Id: I51e0e71f81307c38599c4bbac385ebafeb9f441f
Treehugger Robot [Thu, 24 May 2018 10:14:08 +0000 (10:14 +0000)]
Merge changes Id81271ff,I8f298371
* changes:
DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt
DO NOT MERGE ANYWHERE Sort hiddenapi-p-light-greylist.txt
David Brazdil [Wed, 23 May 2018 14:58:36 +0000 (15:58 +0100)]
DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt
Test: N/A
Change-Id: Id81271ffe2080091d4e4c3d40325183b086dba8e
David Brazdil [Wed, 23 May 2018 14:54:31 +0000 (15:54 +0100)]
DO NOT MERGE ANYWHERE Sort hiddenapi-p-light-greylist.txt
Test: N/A
Change-Id: I8f298371df3efbc3d968c95337e058d6140fe5de
Remi NGUYEN VAN [Thu, 24 May 2018 07:53:00 +0000 (07:53 +0000)]
Merge changes I3b3bcbbd,I18b3f263,I3c416c1a
* changes:
Use CaptivePortalProbeSpec method in portal app
Add configurable captive portal probes
Move CaptivePortalProbeResult to its own file
Hugo Benichi [Thu, 12 Oct 2017 04:04:54 +0000 (13:04 +0900)]
Migrating remaining core networking tests to Junit4
Bug:
62918393
Test: runtest frameworks-net
Merged-In: I30f7eaa0307b8fad5a8de7a0da235a4f76c18677
(clean cherry-pick of I30f7eaa0307b8fad5a8de7a0da235a4f76c18677)
Change-Id: I272fea0bb4a9e7f6252bb3bd14a6b769a082039e
Sundong Ahn [Thu, 24 May 2018 07:17:03 +0000 (16:17 +0900)]
com.android.media.tv.remoteprovider is built with java_sdk_library
The com.android.media.tv.remoteprovider is built with java_sdk_library
and api files are added by running "make update-api".
The com.android.media.tv.remoteprovider is removed in platform.xml
since it will be made auto generation by soong when the library is
built with java_sdk_library.
Bug:
77577799
Test: make -j
make checkapi
Change-Id: If0f33bbdde42d891471cd7d3d295d433a88affec
Treehugger Robot [Thu, 24 May 2018 07:07:15 +0000 (07:07 +0000)]
Merge "Fixup SntpClient to bypass Private DNS"
Erik Kline [Tue, 22 May 2018 12:15:49 +0000 (21:15 +0900)]
Fixup SntpClient to bypass Private DNS
NTP may be necessary in order to validate Private DNS certificates,
so it should be allowed to bypass Private DNS.
Test: as follows
- built, flashed, booted
- tcpdump for port 53; adb shell am restart
queries for the NTP hostname appear in the clear
- runtest frameworks-net passes
Bug:
64133961
Bug:
80118648
Merged-In: I4655e3ce5691098c73bf070b8a9e4759485bb17a
Merged-In: I327b816a9f472e94328232157a3b8887d17b0baf
Change-Id: Id9ceb3fcaaffb48cbbd4cd381d48cae991572c9e
(cherry picked from commit
7eccfeb9ca60aa6e09afbdf3a4435cb2f0d12987)
Remi NGUYEN VAN [Tue, 22 May 2018 08:04:17 +0000 (17:04 +0900)]
Use CaptivePortalProbeSpec method in portal app
This only changes behavior if the EXTRA_CAPTIVE_PORTAL_PROBE_SPEC extra
is passed, which only happens if extra probe specs have been defined in
settings.
Bug: b/
79499239
Test: manual: on 2 different portals, works w/ and w/o the setting
Merged-In: Iebd307b5d73a7b4679baea2a1c12c3baba6a7447
Merged-In: I851d8c41d42dccb03f813e549439f44c83f7d5ac
(clean cherry-pick of pi-dev I70acfd9213bf620cbb79ad999b8ad03472e8d43f)
Change-Id: I3b3bcbbd380f8cbd0b663556d55276f43e30b3e5
Remi NGUYEN VAN [Tue, 22 May 2018 01:01:53 +0000 (10:01 +0900)]
Add configurable captive portal probes
The probes allow testing for a configurable status code and location
header (regexes). They are disabled by default, so this CL is a
no-op unless the probe configurations are pushed.
Bug: b/
79499239
Test: tests in CL pass, manual: captive portal login works
Merged-In: Iec7a74bbf2569a91e958c497200d77e8451cbf7b
Merged-In: Ia958815325d1466345e9626efc8f62fc9d08d774
(clean cherry-pick of pi-dev I785723aaed06054b9aa8ebff77803f23d7836db9)
Change-Id: I18b3f263fed08fa4fee20d5e88f3ec8647d7f835
Remi NGUYEN VAN [Tue, 22 May 2018 00:58:19 +0000 (09:58 +0900)]
Move CaptivePortalProbeResult to its own file
This is necessary to resolve visibility issues for the next change.
Bug: b/
79499239
Test: runtest frameworks-net
Merged-In: Ia48b32307a51a66f2672d7112f71166dd6db41b1
Merged-In: I5df7ee9f16bc6be4f02353d40a843a383dd4cbd9
(Clean cherry-pick of pi-dev I50bc96afe6ae88c8f58a693f0a4e821f1f9b3299)
Change-Id: I3c416c1a91ebfdf914fd528ff8ab73e3eb490562
Remi NGUYEN VAN [Tue, 22 May 2018 09:20:51 +0000 (18:20 +0900)]
Use AI_ADDRCONFIG for most DNS requests
Not using it doubles the number of DNS lookups for single-stack
networks.
Private DNS hostname resolution still does not use this flag so that we
get all address families in advance, in case of LinkProperties changes.
Bug: b/
79811321
Test: manual: Captive portal, 464xlat, networking in apps working
Merged-In: I7037342a93dc48b8e0988e719b9a9a2d5055bcf2
Merged-In: I8ca15fa079cd5ff94e4d9f7e0476504769f9708f
(Clean cherry-pick of pi-dev Ib46756e5e5f8d8d2698c90c5183c368d2d44be7a)
Change-Id: Iedb7a9c5f9caeb66de4505189fca8db91013d844