OSDN Git Service
Jack He [Tue, 8 May 2018 21:51:07 +0000 (14:51 -0700)]
AudioService: Do not disconnect SCO started externally
* AudioService should not disconnect Bluetooth SCO if it is started
externally
* When SCO has already started externally, all SCO connection attempts
through AudioManager API will fail with SCO_AUDIO_STATE_DISCONNECTED
intent
* Remove SCO_STATE_DEACTIVATE_EXT_REQ state since AudioService could no
longer disconnect SCO audio that is started externally
* Change SCO_STATE_* values so that they are consecutive
Bug:
79407565
Test: With Bluetooth HFP device connected:
Test1: make a outgoing call
Test2: make VoIP call during cellular call
Test3: make a VoIP call during another VoIP call
Change-Id: I1e0a10aeb0eac59d4826f9defa595aebd85f534c
(cherry picked from commit
33c3a17113ee93bfd4575241cc15e78afc300f0e)
Calin Juravle [Wed, 9 May 2018 01:55:51 +0000 (01:55 +0000)]
Merge "Process "dalvik.vm.profilebootimage" system property"
Remi NGUYEN VAN [Wed, 9 May 2018 01:29:34 +0000 (01:29 +0000)]
Merge "Add NETWORK_BYPASS_PRIVATE_DNS permission"
android-build-prod (mdb) [Wed, 9 May 2018 00:25:12 +0000 (00:25 +0000)]
Merge "Bluetooth: Fix HFP SCO logic and documentation"
android-build-prod (mdb) [Tue, 8 May 2018 22:22:13 +0000 (22:22 +0000)]
Merge "Update the Open Mobile API version"
Calin Juravle [Tue, 8 May 2018 19:42:30 +0000 (12:42 -0700)]
Process "dalvik.vm.profilebootimage" system property
Read the profile boot image property and pass the appropriate flags to the
android runtime.
Test: build, flash and check properties
Bug:
73313191
Change-Id: Ie972e2eb693678d268e707b9e892c97dd7dd061b
Remi NGUYEN VAN [Tue, 8 May 2018 07:55:42 +0000 (07:55 +0000)]
Merge "Fix testRegisterUsageCallback"
Remi NGUYEN VAN [Tue, 8 May 2018 04:13:07 +0000 (04:13 +0000)]
Merge "Fix testUidPoliciesToString"
Remi NGUYEN VAN [Wed, 25 Apr 2018 08:46:10 +0000 (17:46 +0900)]
Add NETWORK_BYPASS_PRIVATE_DNS permission
Have the captive portal app and the MMS service use this new permission
to bypass private DNS.
This cherry-pick does not have the TODO and #SystemApi comments
deemed unnecessary in the original change.
Bug: b/
78494660
Test: manual: captive portal login works
Merged-In: I0d3429faddc0509781c896608039e4143cb1e8fd
Merged-In: I77bec89592c594392e94da001f1e3992543b23ec
(cherry-pick of I0a4a8d0105becf6957fd44099bd84eca51e6716f, manual merge)
Change-Id: I041d123ccd9bb1af730a97707cce9003b552cffa
android-build-prod (mdb) [Mon, 7 May 2018 23:50:18 +0000 (23:50 +0000)]
Merge "Convert android.test.runner.stubs to Soong"
android-build-prod (mdb) [Mon, 7 May 2018 20:05:54 +0000 (20:05 +0000)]
Merge "Move SettingsLib tests and EasterEgg to aapt2."
Jack He [Thu, 3 May 2018 02:10:56 +0000 (19:10 -0700)]
Bluetooth: Fix HFP SCO logic and documentation
AudioService:
* Call setBtScoActiveDevice and setBluetoothScoOn both in AudioService's
broadcast receiver so that these two methods must be triggerred in
the same sequence as ACTIVE_DEVICE_CHANGED and AUDIO_STATE_CHANGED
intents are sent and we no longer need to handle race condition by
synchronously checking active device in setBluetoothScoOn
* Default sco audio mode when no headset is active should be virtual
voice call, as many HFP devices do not accept SCO audio without an
ongoing call
* Synchronize checkScoAudioState() method with mScoClients
* Add helper functions connectBluetoothScoHelper and
disconnectBluetoothScoHelper to call various SCO setup and tear down
methods based on sco audio mode
* Try raw, virtual call, and voice recognition mode when disconnecting
externally started SCO
* Add new sco state SCO_STATE_DEACTIVATING to allow back to back calling
of startBluetoothSco and stopBluetoothSco
Audio Manager:
* Modified AudioManager logic so that removed devices callback is called
before newly added devices
BluetoothHeadset:
* Modified BluetoothHeadset so that start and stop SCO using virtual
voice call no longer need a parameter and will use active device by
default
* Modified documentation around various sco mangement APIs to match
their expected behaviors
Bug:
76114959
Test: VoIP calls sanity test cases
Change-Id: Id50db88f4ff36069b0f392c81dd9d90c24cd2206
(cherry picked from commit
89f979849a5cf2fa4e16d4f24ab41409f16a9956)
Aurimas Liutikas [Wed, 6 Dec 2017 00:20:43 +0000 (16:20 -0800)]
Move SettingsLib tests and EasterEgg to aapt2.
Test: make -j SettingsLibTests
Change-Id: I38fbd6af7eb5707d76fb930b4d685e30b26f45de
Merged-In: I38fbd6af7eb5707d76fb930b4d685e30b26f45de
(cherry picked from commit
41df109aca81726554d2aedf4ebea6c98f663273)
Colin Cross [Mon, 7 May 2018 17:53:09 +0000 (17:53 +0000)]
Merge changes from topic "soong_support_libs"
* changes:
convert Uibench test to aapt2
Migrate PrintSpooler to aapt2.
Migrate to AAPT2
android-build-prod (mdb) [Sat, 5 May 2018 14:43:45 +0000 (14:43 +0000)]
Merge "Convert to Soong"
Dan Willemsen [Sat, 5 May 2018 06:17:00 +0000 (23:17 -0700)]
Convert to Soong
See build/soong/README.md for more information.
Test: cd frameworks/base/cmds/backup mma
Change-Id: I88a45ae568f80228c70f3e4a4a1facaff9520587
android-build-prod (mdb) [Fri, 4 May 2018 23:19:19 +0000 (23:19 +0000)]
Merge "AudioService: fix uid check in setBluetoothScoOn"
Andreas Gampe [Fri, 4 May 2018 22:02:14 +0000 (22:02 +0000)]
Merge "Framework: Remove ART tombstoned config"
Jack Yu [Fri, 4 May 2018 16:52:01 +0000 (16:52 +0000)]
Merge "Enabled area info update for India"
Kirill Grouchnikov [Tue, 1 Aug 2017 13:35:13 +0000 (09:35 -0400)]
convert Uibench test to aapt2
Bug: NA
Test: build
Change-Id: Ibe70c6c15d8f72d40b1d6c2c43872d02a0bdb872
Merged-In: Ibe70c6c15d8f72d40b1d6c2c43872d02a0bdb872
(cherry picked from commit
bffef1f024fbd7fb005a73d0744d7f8ee019fd27)
Aurimas Liutikas [Sat, 6 Jan 2018 00:27:23 +0000 (16:27 -0800)]
Migrate PrintSpooler to aapt2.
Test: make -j PrintSpooler
Change-Id: Iad4d4d477792f13fb92e3ee7f4f5fa781f3298c4
Merged-In: Iad4d4d477792f13fb92e3ee7f4f5fa781f3298c4
(cherry picked from commit
87f7ce4bd17b4d1cd0721b7b0d05f57ffdef8a0d)
Alan Viverette [Fri, 23 Mar 2018 18:33:43 +0000 (14:33 -0400)]
Migrate to AAPT2
Bug:
73128633
Test: make checkbuild
Change-Id: I4b6b73299d1cae61994c34ebb77ca587c5ee64ff
Merged-In: I4b6b73299d1cae61994c34ebb77ca587c5ee64ff
(cherry picked from commit
e3264ba6cf7df5b33b10dd6a15ac5010c78bac6e)
Andreas Gampe [Thu, 3 May 2018 17:39:31 +0000 (10:39 -0700)]
Framework: Remove ART tombstoned config
The explicit option is no longer supported.
Bug:
77288304
Test: m
Test: device boots
Test: ANR dumps work
Change-Id: I1ffcf0593e1f6591d1b33882edf79381e59c2121
android-build-prod (mdb) [Thu, 3 May 2018 20:47:01 +0000 (20:47 +0000)]
Merge "Fix spelling errors in BluetoothGatt documentation"
Stanley Tng [Thu, 3 May 2018 15:50:49 +0000 (08:50 -0700)]
Fix spelling errors in BluetoothGatt documentation
Correct "paramter" to "parameter". Correct "connectoin" to connection.
Bug:
79198797
Test: Compile
Change-Id: I98646eec66da2aaa6f74ae2db35ea914c6a105a1
Jack Yu [Tue, 1 May 2018 20:53:51 +0000 (13:53 -0700)]
Enabled area info update for India
We only enabled for MCC 404 before. Now we enable
MCC 405 as well.
Test: Manual
Bug:
69725276
Merged-In: Icc42fe114195c08709a4e601d7fc139041ca878f
Change-Id: Icc42fe114195c08709a4e601d7fc139041ca878f
(cherry picked from commit
89081f4f61811e3a2078871aa1ef953a894f672a)
android-build-prod (mdb) [Thu, 3 May 2018 15:31:18 +0000 (15:31 +0000)]
Merge "Framework: Restrict warning message"
David Brazdil [Thu, 3 May 2018 14:15:13 +0000 (14:15 +0000)]
Merge changes I4e13e5da,I68582cf0,I528a70cc
* changes:
Remove hiddenapi-blacklist.txt
Update hiddenapi-p-light-greylist.txt
Add rule to build hidden API blacklist
David Brazdil [Thu, 3 May 2018 09:57:45 +0000 (10:57 +0100)]
Remove hiddenapi-blacklist.txt
Create an empty file in the build rule instead. Do not merged this
beyond AOSP. We have an implicitly built blacklist everywhere else.
Bug:
64382372
Test: make
Change-Id: I4e13e5daf635934a152d389a95bf45c482b5a87f
Merged-In: Ifa912f8751025b7de24a982a1a227a9c27d18267
Erik Kline [Thu, 3 May 2018 10:44:30 +0000 (10:44 +0000)]
Merge "Add static IpClient logging"
David Brazdil [Thu, 3 May 2018 09:55:34 +0000 (10:55 +0100)]
Update hiddenapi-p-light-greylist.txt
Test: N/A
Change-Id: I68582cf087b2e92f10b86c7c5a8bcd095e80ffab
David Brazdil [Wed, 2 May 2018 14:47:32 +0000 (15:47 +0100)]
Add rule to build hidden API blacklist
Add a new Makefile rule 'hiddenapi-b-blacklist' which takes the
manually published hiddenapi-p-light-greylist.txt and subtracts it
from private-dex.txt built for the current branch. This is meant to
provide an approximation of the blacklist in internal branches.
Bug:
64382372
Test: make hiddenapi-aosp-blacklist
Change-Id: I528a70cc6a71e988b53d94ca7ef81d6c181e5153
Erik Kline [Tue, 1 May 2018 07:51:44 +0000 (16:51 +0900)]
Add static IpClient logging
Support keeping IpClient logs around and dumping them
during dumpsys. Previously we got this benefit for
wifi by virtue of WifiStateMachine's long-lived nature.
Now that this is changing we need to be sure we have
logs, and this method gets us Ethernet logs as well.
Bug:
62476366
Bug:
77999594
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- dumpsys connmetrics [ipclient] works
Merged-In: Ib4daf0902cae91acadbe9965de1fb73c96a47bec
Merged-In: Ie947394fabcaca7fc1d067f095c2442ee2704593
Change-Id: I1136a83de8097fdb4130debe1eaf689be7132fe5
(cherry picked from commit
3f8306b8c56b58054800a576912204e8bf66f9f4)
android-build-prod (mdb) [Wed, 2 May 2018 21:27:00 +0000 (21:27 +0000)]
Merge "don't block adb while running uninstall"
Vitor Albuquerque [Wed, 7 Mar 2018 13:39:59 +0000 (10:39 -0300)]
AudioService: fix uid check in setBluetoothScoOn
Calling UID is now checked in setBluetoothScoOn and only allow
route to change if request comes from a system component.
The check was not taking into account secondary users, hence
causing failure to route audio to SCO when secondary users
were active.
This change makes sure we are checking the correct app id,
without taking into account the user id.
Bug:
74057977
Test: SCO call using Guest User
Change-Id: I3e26dedb6333a85b315073fe4830c4d1b8070742
wangmingming1 [Tue, 10 Apr 2018 01:35:25 +0000 (09:35 +0800)]
don't block adb while running uninstall
Test: Manual
1. setup a work profile
2. set a uninstall restriction on foo app for the work profile
by calling set DevicePolicyManager.setUninstallBlocked()
3. observe adb uninstallation can return with 'DELETE_FAILED_OWNER_BLOCKED'
message without blocking forever by using the following command line:
`adb uninstall --user user-id-of-work-profile com.foo`
Test: Manual
1. install lots of apks via adb
2. uninstall apks via adb
Change-Id: I68706782ae547250433e3dd8ff285d4932473033
Merged-In: If89978c5a79ef998bde55c254ced4b6a3ff6e645
Signed-off-by: wangmingming1 <wangmingming1@xiaomi.com>
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 10:40:37 +0000 (10:40 +0000)]
Merge "Build same hidden API lists as in pi-dev"
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"
Remi NGUYEN VAN [Wed, 2 May 2018 08:32:21 +0000 (17:32 +0900)]
Fix testUidPoliciesToString
The test is likely failing since go/ag/
1344349 because of a bad
copy-paste between patchsets 6 and 7.
Test: test now passes
Change-Id: I87341c4f4db1e7b61c3899368b24ea484fe8bfd1
Remi NGUYEN VAN [Tue, 24 Apr 2018 05:47:23 +0000 (14:47 +0900)]
Fix testRegisterUsageCallback
noteOp (introduced in go/ag/
3897834) checks that the calling uid matches
the calling package, which is not correct when using a fake calling
package. Use the real package of the test so permissions are checked
properly.
The test currently only fails this way in pi-dev as noteOp is only used
in pi-dev.
Change-Id: I9ac3717af9335ba9efa0b8842a2df0d7b69ec9ab
Test: Fixed test now passes in pi-dev
Bug: b/
78487385
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
Andreas Gampe [Tue, 1 May 2018 19:10:54 +0000 (12:10 -0700)]
Framework: Restrict warning message
Only print the message of the cache wasn't pruned.
Bug:
26978865
Test: manual
Change-Id: I564ecddf6c8fafcc9699ec6bfbd622214edf79c8
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 03:07:35 +0000 (03:07 +0000)]
Merge "Let DnsManager fill in LinkProperties for private DNSes"
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 20:37:46 +0000 (20:37 +0000)]
Merge "Get/Set IO capability of Bluetooth device"
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 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
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)
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"
Nan Zhang [Thu, 26 Apr 2018 21:55:41 +0000 (14:55 -0700)]
Convert android.test.runner.stubs to Soong
Test: m clean && m check-android-test-runner-api, and check jar file
content.
Bug: b/
70351683
Change-Id: I6ab6bded4bb2432212fcb4f676b27624fe17a397
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 12:39:41 +0000 (12:39 +0000)]
Merge "Generate @removed DEX API signatures"
Ruchi Kandoi [Thu, 26 Apr 2018 08:45:14 +0000 (01:45 -0700)]
Update the Open Mobile API version
The current implementation is inline with OMAPI version 3.3
Test: None
Bug:
64994044
Change-Id: I22f969e99f4dfc677931adf3494b47d6972d026d
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 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 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
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 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
Treehugger Robot [Tue, 24 Apr 2018 03:56:40 +0000 (03:56 +0000)]
Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE"
Treehugger Robot [Mon, 23 Apr 2018 22:35:17 +0000 (22:35 +0000)]
Merge "PackageManager: Skip dexopt on install for debuggable apps"
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
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)
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
Treehugger Robot [Fri, 20 Apr 2018 01:09:33 +0000 (01:09 +0000)]
Merge "apf: Add immediate encoding tests for LI"
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 19:23:58 +0000 (19:23 +0000)]
Merge "Cherry-pick 'Fix a tiny bug in NetworkScanRequest'"
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"
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
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."