OSDN Git Service
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."
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
Treehugger Robot [Wed, 18 Apr 2018 12:53:30 +0000 (12:53 +0000)]
Merge "Stop InCall Notification to avoid track leak"
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 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>
Treehugger Robot [Tue, 17 Apr 2018 19:50:41 +0000 (19:50 +0000)]
Merge "Correct sendBroadcast test"
sqian [Tue, 17 Apr 2018 18:54:14 +0000 (11:54 -0700)]
Revert "Remove the OEM hook implementation and usage"
This reverts commit
2635a89c8cb536d487c5a77ea205f787c19dc92e.
Bug:
34344851
Change-Id: I96697165fd75054de42f007c16ca294ed6725708
Daniel Bonnevier [Mon, 16 Apr 2018 11:25:32 +0000 (13:25 +0200)]
Correct sendBroadcast test
Commit
23eb3a19 changed the implementation from sendBroadcast to
sendBroadcastAsUser but didn't change the test.
Test: adb shell am instrument -r -w -e class \
android.app.timezone.RulesUpdaterContractTest#sendBroadcast \
com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Bug:
78166765
Merged-In: I0a47e096a46fc63d46dd9ff878a4af0d76af82f0
Change-Id: I0a47e096a46fc63d46dd9ff878a4af0d76af82f0
Bernie Innocenti [Mon, 16 Apr 2018 14:27:51 +0000 (23:27 +0900)]
Adjust APF interpreter tests to match APFv4
Change-Id: I4311c754f1cb79633d49c5c1c0b4e27c8dde727e
Bug:
73804303
Test: runtest -x tests/net/java/android/net/apf/ApfTest.java
Treehugger Robot [Tue, 17 Apr 2018 00:07:38 +0000 (00:07 +0000)]
Merge "Clarify API doc for BluetoothGattServer::addService"
Treehugger Robot [Tue, 17 Apr 2018 00:02:32 +0000 (00:02 +0000)]
Merge "Cleanup documentation for LE CoC in BluetoothAdapter"
Treehugger Robot [Mon, 16 Apr 2018 23:48:48 +0000 (23:48 +0000)]
Merge "Source of deadlock between PlayerBase.mLock and PlaybackActivityMonitor.mPlayerLock:"
Stanley Tng [Thu, 5 Apr 2018 01:33:46 +0000 (18:33 -0700)]
Cleanup documentation for LE CoC in BluetoothAdapter
Test: Compile
Bug:
77631591
Change-Id: Ic3c7f13e560534a048bf5c8b274fe62190c214c7
Treehugger Robot [Mon, 16 Apr 2018 21:24:45 +0000 (21:24 +0000)]
Merge "Migrate android.test.base.stubs generation to Soong."
Stanley Tng [Fri, 13 Apr 2018 21:54:10 +0000 (14:54 -0700)]
Clarify API doc for BluetoothGattServer::addService
Clarify that the caller has to wait for onServiceAdded callback before
calling BluetoothGattServer::addService again.
Bug:
72717069
Test: Compile
Change-Id: I20b031c724ba64bfd71cf10e58e587f69e4a2555
Hall Liu [Mon, 16 Apr 2018 18:40:28 +0000 (18:40 +0000)]
Merge "Move RTT system setting to Settings.Secure"
Treehugger Robot [Mon, 16 Apr 2018 16:33:24 +0000 (16:33 +0000)]
Merge "Revert "Frameworks/base: Compiled-classes support""
Bernie Innocenti [Mon, 16 Apr 2018 05:24:29 +0000 (05:24 +0000)]
Merge "Teach ApfGenerator about the new opcodes for accessing data memory"
Tyler Gunn [Mon, 16 Apr 2018 04:18:00 +0000 (04:18 +0000)]
Merge "Add permission whitelist for EmergencyInfo app."
Nan Zhang [Fri, 13 Apr 2018 21:48:32 +0000 (14:48 -0700)]
Migrate android.test.base.stubs generation to Soong.
Bug: b/
70351683
Test: m clean && m check-android-test-base-api
and compare the old and new stubs.jar using md5sum.
Change-Id: Ia9273016c4d3472888f970cbddf0ed85c0501eb3
Andreas Gampe [Fri, 13 Apr 2018 18:30:09 +0000 (11:30 -0700)]
Revert "Frameworks/base: Compiled-classes support"
This reverts commit
ca775941f3b7981aabf3a6a3b84d6c94f4f76aff.
Bug:
76145463
Test: m
Change-Id: I5a368cd01812e16869352ec219eae095df4919c4
Treehugger Robot [Fri, 13 Apr 2018 17:28:22 +0000 (17:28 +0000)]
Merge "Add filegroup for supporting apache-http stubs generation."
Treehugger Robot [Fri, 13 Apr 2018 10:55:05 +0000 (10:55 +0000)]
Merge "Make android.test.mock.stubs in Android.bp"
Bernie Innocenti [Thu, 22 Mar 2018 14:07:47 +0000 (23:07 +0900)]
Teach ApfGenerator about the new opcodes for accessing data memory
Bug:
73804303
Bug:
36221302
Test: runtest -x tests/net/java/android/net/apf/ApfTest.java
Change-Id: Iaf92ca0bbebaaf66d0f2f7adc1a9014607f3ecf6
Jiyong Park [Tue, 13 Mar 2018 07:06:03 +0000 (16:06 +0900)]
Make android.test.mock.stubs in Android.bp
Stubs libraries android.test.mock.stubs and
android.test.mock.stubs-system are now built in Android.bp.
(Note that API check and update are still done in Android.mk)
As a good side effect, this allows android.test.runner[-minus-junit]
libraries (that are defined in Android.bp) to be built with the
android.test.mock.stubs instead of the runtime library
android.test.mock. This in turn allows us to prevent java:sdk ->
java:platform dependency also in Soong, because the runner libraries
were the only violators.
Bug:
73829976
Test: m -j android.test.mock.stubs android.test.mock.stubs-system
Test: m -j checkapi
Test: m -j update-api
Merged-In: I830a8eb13aa43b9aa4c8394f3c2fd91ee18b1f85
Change-Id: I830a8eb13aa43b9aa4c8394f3c2fd91ee18b1f85
(cherry picked from commit
e649b8066c3385ba0b667a79d378402b15ef3127)
Jean-Michel Trivi [Fri, 13 Apr 2018 00:23:22 +0000 (17:23 -0700)]
Source of deadlock between PlayerBase.mLock and
PlaybackActivityMonitor.mPlayerLock:
android.media.MediaPlayer.release()
> android.media.PlayerBase.baseRelease()
> synchronized (mLock)
> com.android.server.audio.PlaybackActivityMonitor.releasePlayer()
> synchronized(mPlayerLock)
and:
com.android.server.audio.PlaybackActivityMonitor.unmutePlayersForCall()
> synchronized (mPlayerLock)
> android.media.PlayerProxy.setVolume()
> android.media.PlayerBase$IPlayerWrapper.setVolume()
> android.media.PlayerBase.baseSetVolume()
> synchronized (mLock)
playerSetVolume()
Since system_server can have its own players, the calls to
AudioService from PlayerBase can be synchronous, hence the
deadlock.
The fix consists in never holding the lock in PlayerBase
while calling into AudioService.
Refactor the playstate update into a method used for
start / stop / pause.
Bug:
72294559
Test: see bug
Change-Id: Ib41045de124683a7484184cf63577bd2412d1362
Chen Xu [Thu, 12 Apr 2018 22:58:37 +0000 (22:58 +0000)]
Merge "A test api to override carrier information"
fionaxu [Mon, 19 Mar 2018 07:41:14 +0000 (00:41 -0700)]
A test api to override carrier information
This API should only be used for testing purpose e.g., CTS/GTS/SL4A
By overriding carrier information, we could force a particular carrier id,
carrier's config, but also any country or carrier overlays to be loaded
when using a test SIM with a call box.
Bug:
72332597
Test: atest CtsTelephonyTestCases:CarrierIdentificationTest
Change-Id: Icd5804375ef9334c9f6c382cc6a774b9c9c15213
(cherry picked from commit
5b509b81a0d5b14148745368b153dc6b8d4482ac)
Merged-in:
5b509b81a0d5b14148745368b153dc6b8d4482ac
Hall Liu [Thu, 12 Apr 2018 20:41:44 +0000 (20:41 +0000)]
Merge "Make setServiceId a TestApi"
Hall Liu [Mon, 2 Apr 2018 22:41:07 +0000 (15:41 -0700)]
Move RTT system setting to Settings.Secure
Bug:
76449217
Test: manual
Change-Id: Id198aab697e9e37c941b0d99255e4c6a0e1f91a9
Merged-In: I85620d5b834aa7e04579212f3fd5cf6c0498b570
Stanley Tng [Thu, 12 Apr 2018 14:36:12 +0000 (14:36 +0000)]
Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()"
Chen Xu [Thu, 12 Apr 2018 04:30:18 +0000 (04:30 +0000)]
Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance"
Hall Liu [Tue, 10 Apr 2018 21:04:12 +0000 (14:04 -0700)]
Make setServiceId a TestApi
Bug:
77152869
Test: CTS
Change-Id: I26f60b48865953971de02c50db48e0ff66f4e2a0
Merged-In: I26f60b48865953971de02c50db48e0ff66f4e2a0
fionaxu [Wed, 11 Apr 2018 19:47:46 +0000 (12:47 -0700)]
Change getGroupIdLevel1() to use subId from TelephonyManager Instance
Bug:
77905912
Test: Build
Change-Id: I720971ce115147b994e27611a0dcf052989180ec
(cherry picked from commit
272e8cf87e3aa780d7b83c021b859fdfc396f9d8)
Merged-in:
272e8cf87e3aa780d7b83c021b859fdfc396f9d8
Nan Zhang [Tue, 10 Apr 2018 00:41:51 +0000 (17:41 -0700)]
Add filegroup for supporting apache-http stubs generation.
Bug: b/
70351683
Test: m clean && m check-apache-http-legacy-api,
and compare the old and new stubs.jar using md5sum.
Change-Id: I0035837aef48a76e40a2c723c2adce3ff129ad28
Merged-In: I0035837aef48a76e40a2c723c2adce3ff129ad28
Treehugger Robot [Wed, 11 Apr 2018 21:47:53 +0000 (21:47 +0000)]
Merge "Don't unnecessarily reevaluate tethering provisioning"
Erik Kline [Wed, 28 Feb 2018 06:01:35 +0000 (15:01 +0900)]
Don't unnecessarily reevaluate tethering provisioning
Registering for carrier config changes can deliver a sticky broadcast
and can cause Tethering to think something has changed and reevaluate
provisioning status, even though this has been checked before it
entered tethering mode alive state.
Additionally, move the provisioning_app{,no_ui} resources into the
TetheringConfiguration, if for no other reason than now we can log
it in .toString().
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- manual USB tethering toward WiFi works
Bug:
69565814
Merged-In: If254326e892b78ef9daf620f829c1def136d695c
Merged-In: I288093a1d76566e72d4889d92c7aedafc318c8b6
Merged-Id: I01c71fd971a4683bb2b6d14825d36f24a04d88a8
Change-Id: I01c71fd971a4683bb2b6d14825d36f24a04d88a8
(cherry picked from commit
1b450e3eb9106a9cc73dfc144d275141dd5017ef)
Tyler Gunn [Wed, 11 Apr 2018 18:05:32 +0000 (11:05 -0700)]
Add permission whitelist for EmergencyInfo app.
This is the "Emergency Info" screen available from the lock screen.
It requires the CALL_PRIVILEGED permission in order for it to be able to
place emergency calls. This can occur if a user adds an emergency number
to their emergency contacts.
Test: make checkbuild
Bug:
76086838
Change-Id: I76e8318c5c05bbbbdf02d2c6951f742c3bd67ea6
Colin Cross [Tue, 10 Apr 2018 17:15:28 +0000 (17:15 +0000)]
Merge "Add a droiddoc generator for hwbinder.stubs"
Colin Cross [Tue, 10 Apr 2018 16:06:28 +0000 (16:06 +0000)]
Merge changes from topic "hidl-system-api"
* changes:
HIDL: add APIs used by subclasses to SystemApi
Update HIDL-related documentation.
Add remaining missing HIDL SystemApi methods.
HIDL: reportSyspropMethod -> enableInstrumentation
Allow HIDL to be used in priv-apps.
Treehugger Robot [Tue, 10 Apr 2018 08:35:31 +0000 (08:35 +0000)]
Merge "Revert "Don't unnecessarily reevaluate tethering provisioning""
Erik Kline [Tue, 10 Apr 2018 07:01:16 +0000 (07:01 +0000)]
Revert "Don't unnecessarily reevaluate tethering provisioning"
This reverts commit
8067d78c32f545db6d35c660279ab3f2326ba41d.
Change-Id: I9098f98cb134c35692c1384339f9407b94ce6f28
Treehugger Robot [Tue, 10 Apr 2018 03:22:10 +0000 (03:22 +0000)]
Merge "Don't unnecessarily reevaluate tethering provisioning"
Erik Kline [Tue, 10 Apr 2018 03:16:07 +0000 (03:16 +0000)]
Merge "Trigger NetworkCallback events when private DNS usage has changed."
dalyk [Mon, 5 Mar 2018 17:42:22 +0000 (12:42 -0500)]
Trigger NetworkCallback events when private DNS usage has changed.
Relies on events sent from netd in aosp/578162.
Test: Added tests to ConnectivityServiceTest. Added a new test
class DnsManagerTest. Built a simple app that appears to
receive onLinkProperties events correctly upon manual changes
to the private DNS settings on a Pixel.
Bug:
71828272
Change-Id: I68665aaf74b7d59182cc6f9586b80b55b0dfe427
Treehugger Robot [Mon, 9 Apr 2018 07:55:50 +0000 (07:55 +0000)]
Merge "Support bluetooth not using MultinetworkPolicyTracker"
Erik Kline [Mon, 12 Mar 2018 14:18:58 +0000 (23:18 +0900)]
Support bluetooth not using MultinetworkPolicyTracker
This required advancing the IpManager to IpClient refactoring
(Bluetooth used IpManager and friends). Most importantly, the
Bluetooth code used WaitForProvisioningCallback, so this is
moved into IpClient proper now. Also: some more renaming
cleanup.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
62476366
Bug:
72663849
Change-Id: I9eee2a9d5c31cdd48a054a7edc3403584efb1864
Erik Kline [Wed, 28 Feb 2018 06:01:35 +0000 (15:01 +0900)]
Don't unnecessarily reevaluate tethering provisioning
Registering for carrier config changes can deliver a sticky broadcast
and can cause Tethering to think something has changed and reevaluate
provisioning status, even though this has been checked before it
entered tethering mode alive state.
Additionally, move the provisioning_app{,no_ui} resources into the
TetheringConfiguration, if for no other reason than now we can log
it in .toString().
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- manual USB tethering toward WiFi works
Bug:
69565814
Change-Id: Ib8b2620ce44c55e5eb0afd3f00f3f5aa4fc8a593
Treehugger Robot [Fri, 6 Apr 2018 21:54:06 +0000 (21:54 +0000)]
Merge "Bluetooth: Add hidden API to get current user of HID Device (1/3)"
Treehugger Robot [Fri, 6 Apr 2018 17:17:25 +0000 (17:17 +0000)]
Merge "Clarify doc comment for android.os.Build.VERSION.RELEASE"
Jayachandran Chinnakkannu [Fri, 6 Apr 2018 16:31:15 +0000 (16:31 +0000)]
Merge "Correct the value of RESOURCES_UNAVAILABLE_OR_UNSPECIFIED"
Daniel Colascione [Fri, 6 Apr 2018 15:12:05 +0000 (08:12 -0700)]
Clarify doc comment for android.os.Build.VERSION.RELEASE
The RELEASE field has no guaranteed internal structure and developers
should not attempt to parse it.
Test: no code changes
Change-Id: I0ea3ab5ba5dd4cc733feb62725cf7c62c00c857b
Jayachandran C [Fri, 6 Apr 2018 08:10:38 +0000 (01:10 -0700)]
Correct the value of RESOURCES_UNAVAILABLE_OR_UNSPECIFIED
Test: Build
Bug:
77657541
Change-Id: Ia6b576c222776cbc7e54e15cb54e39775e76ea56
Treehugger Robot [Fri, 6 Apr 2018 00:31:20 +0000 (00:31 +0000)]
Merge "Remove an API that doesn't exist."
Treehugger Robot [Thu, 5 Apr 2018 23:52:55 +0000 (23:52 +0000)]
Merge "Move the logic of (re)evaluation of Private DNS"
Erik Kline [Wed, 21 Mar 2018 14:18:33 +0000 (07:18 -0700)]
Move the logic of (re)evaluation of Private DNS
Moves this out of ConnectivityService and into each NetworkMonitor
(where it's more self-contained).
Test: as follows
- builds, flashes, boots
- runtest frameworks-net passes
- manual testing with working and non-working hostnames behaves
somewhat (but not entirely) as expected, and not always quickly
Bug:
64133961
Bug:
72345192
Bug:
73872000
Bug:
77140445
Change-Id: Ic4322af3cb49149f2d975cb31f54b2ac7927f907
Dan Albert [Thu, 5 Apr 2018 22:00:00 +0000 (15:00 -0700)]
Remove an API that doesn't exist.
Apparently this was removed in Jelly Bean:
https://stackoverflow.com/q/
24312632/632035. Keeping the decl in the
NDK just confuses people: https://stackoverflow.com/q/
49646596/632035.
Test: make checkbuild
Bug: None
Change-Id: If549fcd8f4052e633646c4ce8a054a0bbcd8b2bf
Treehugger Robot [Wed, 4 Apr 2018 23:04:08 +0000 (23:04 +0000)]
Merge "Remove duplicate definitions of utility variables"
Treehugger Robot [Wed, 4 Apr 2018 22:10:19 +0000 (22:10 +0000)]
Merge "Add Polish keycharactermap"
Treehugger Robot [Wed, 4 Apr 2018 21:42:17 +0000 (21:42 +0000)]
Merge "Hearing Aid: change get/set active device (3/3)"
Treehugger Robot [Wed, 4 Apr 2018 18:39:38 +0000 (18:39 +0000)]
Merge "Modify isShowing method in Dialog"
Benedict Wong [Wed, 4 Apr 2018 17:14:46 +0000 (17:14 +0000)]
Merge "Force creation of Socket upon Transform application"
Chen Xu [Wed, 4 Apr 2018 03:17:39 +0000 (03:17 +0000)]
Merge "throw runtimeException for applicable TM APIs"
tiansiming [田思明] [Fri, 9 Mar 2018 09:19:12 +0000 (17:19 +0800)]
Modify isShowing method in Dialog
The method isShowing in Dialog.java is to judge whether
the dialog is currently showing, but it will return true
when the dialog is hidden.
Bug:
74416088
Test: modify testShow in DialogTest.java (see 639879)
run cts -m CtsAppTestCases -t android.app.cts.DialogTest#testShow
Change-Id: Ibf15e080678f414f8a66ff0841be17a2f9d2d652
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com>
Mathieu Chartier [Wed, 4 Apr 2018 02:14:51 +0000 (02:14 +0000)]
Merge "Add dedicated flag to control app image generation"
fionaxu [Fri, 23 Mar 2018 18:52:44 +0000 (11:52 -0700)]
throw runtimeException for applicable TM APIs
1. This CL revert some API change from ag/
3710629.
2. throw runtime exception when running in a non-1000 UID.
3. throw for methods that persist some sort of state and readers could continue to
return placeholder values.
4. for rest of TelephonyManager API cleanup b/
74401420.
Bug:
74016743
Test: Build
Change-Id: I2846efc11eebce4a923762f56f09daaf37c44763
(cherry picked from commit
f20f0d916f2326bee618600119107da1a8ae15a8)
Merged-in: I2846efc11eebce4a923762f56f09daaf37c44763
Benedict Wong [Tue, 3 Apr 2018 01:12:34 +0000 (18:12 -0700)]
Force creation of Socket upon Transform application
This change forces Socket and DatagramSocket to populate the
SocketImpl, ensuring that the socket file descriptor can be
retrieved when applying Transport mode Transforms
This is done by calling getSoLinger(), triggering a getImpl(), which
triggers setImpl() if needed.
Bug:
77491294
Test: Added tests in IpSecManagerTest, ran on walleye
Change-Id: I40da08b031357710eb794e0f866aec5660c79594
Mathieu Chartier [Tue, 13 Mar 2018 00:11:07 +0000 (17:11 -0700)]
Add dedicated flag to control app image generation
Also disable the flag for split APKs.
Bug:
72696798
Test: manual
(cherry picked from commit
a9c343386d5505d7111aee3c1ffec409c9730f21)
Merged-In: I25007500e221744a218b165dde41ca9db19b1832
Change-Id: I1dc3137307834d948b52af18205ca47dc8dc7e67
Treehugger Robot [Tue, 3 Apr 2018 19:56:19 +0000 (19:56 +0000)]
Merge "Support bypassing TLS in the framework"
Hansong Zhang [Tue, 3 Apr 2018 19:12:53 +0000 (12:12 -0700)]
Bluetooth: Add hidden API to get current user of HID Device (1/3)
Bug:
69136526
Test: test with apps using HID Device profile
Change-Id: If0e49840257c877c975c2da176a08e613668cbc3
Stanley Tng [Mon, 19 Mar 2018 19:28:56 +0000 (12:28 -0700)]
Add min_ce/max_ce parameters to requestLeConnectionUpdate()
Add new test parameters, min_ce and max_ce, to the SL4A tests for LE
Connection-oriented Channel (CoC) feature. This CL passes these 2
parameters to native stack.
Test: Run cmd: act.py -c $MY_SL4A_CONFIG -tc BleCoc2ConnTest
Bug:
77528723
Change-Id: I9d3d74f671772014209f8114c2d1b8ba606c54d5
Treehugger Robot [Tue, 3 Apr 2018 18:13:45 +0000 (18:13 +0000)]
Merge "Frameworks: In the kill handler, ensure the logging handler was run"
Ruchi Kandoi [Tue, 3 Apr 2018 16:48:18 +0000 (16:48 +0000)]
Merge "Add an Executor for the onConnectedListener"
Pankaj Kanwar [Tue, 3 Apr 2018 16:05:51 +0000 (16:05 +0000)]
Merge "Address IMSI privacy issues."
Andreas Gampe [Mon, 2 Apr 2018 21:00:47 +0000 (14:00 -0700)]
Frameworks: In the kill handler, ensure the logging handler was run
In the KillApplicationHandler for uncaught exceptions ensure that the
LoggingHandler has been run. This ensures logging when code directly
calls getUncaughtExceptionHandler().uncaughtException().
Bug:
29624607
Bug:
73380984
Test: m
Test: manual
Change-Id: I9c9216714b4cf029d7ed21e29313c0e802345337
Erik Kline [Wed, 21 Mar 2018 14:18:33 +0000 (07:18 -0700)]
Support bypassing TLS in the framework
This change comprises the following parts:
[1] android.net.dns.ResolvUtil, containing methods that encapsulate the
use of the high bit in netids used in DNS resolution contexts.
[2] Updates to captive portal apps to call the ResolvUtil method that
enables DNS-over-TLS bypass for the captive portal app process.
Test: as follows
- builds
- flashes
- boots
- runtest frameworks-net passes
Bug:
64133961
Bug:
72345192
Change-Id: I2072c1f68d6978fa0d7e9d8693135a2c51bb0f87
pkanwar [Mon, 20 Nov 2017 02:08:40 +0000 (18:08 -0800)]
Address IMSI privacy issues.
Added method resetCarrierKeysForImsiEncryption
to allow for keys to be reset.
Bug:
35606429
Test: manual
Change-Id: Id2e92917b50fa2163b2bab112df6e80b5e9c5795
Merged-In: Id2e92917b50fa2163b2bab112df6e80b5e9c5795
Hall Liu [Tue, 3 Apr 2018 00:14:58 +0000 (00:14 +0000)]
Merge "Change signature of requestBluetoothAudio"
Ruchi Kandoi [Mon, 2 Apr 2018 20:31:47 +0000 (13:31 -0700)]
Add an Executor for the onConnectedListener
Test: Run CtsOmapiTestCases
Bug:
76448978
Change-Id: Ieb30b8935961db25bd058e1c41c127fa5a4437ff
Hall Liu [Mon, 2 Apr 2018 20:52:57 +0000 (13:52 -0700)]
Change signature of requestBluetoothAudio
requestBluetoothAudio now takes a BluetoothDevice instead of a string.
Bug:
74408978
Test: unable to CTS -- can't emulate bluetooth devices
Change-Id: Id21e32b911da234f69a248e9937f9df0cf12a9a9
Treehugger Robot [Mon, 2 Apr 2018 18:47:18 +0000 (18:47 +0000)]
Merge "Refactor isTetheringSupported() calls"
Xiangyu/Malcolm Chen [Mon, 2 Apr 2018 18:43:01 +0000 (18:43 +0000)]
Merge "Adding debug message inside NetworkServiceCallback."
Treehugger Robot [Mon, 2 Apr 2018 13:57:43 +0000 (13:57 +0000)]
Merge "APF: drop multicast ICMPv6 while in doze mode"
Bernie Innocenti [Wed, 28 Mar 2018 11:11:49 +0000 (20:11 +0900)]
APF: drop multicast ICMPv6 while in doze mode
Some WiFi hotspots send excessive multicast IPv6 ping requests which
cause considerable power drain. Thus, drop all multicast ICMPv6 ping
requests while the device is in doze mode.
Bug:
66930077
Test: runtest -x tests/net/java/android/net/apf/ApfTest.java
Test: manual - compared generated APF bytecode using apf_disassembler
Test: manual - force idle mode while sending multicast pings to device
Change-Id: I25dbf99985cf4413b4d0e3920d281fe6d663197a
Hall Liu [Sat, 31 Mar 2018 00:28:06 +0000 (00:28 +0000)]
Merge "Make changes to MBMS API following recs"