OSDN Git Service
Dan Zhang [Thu, 18 Jan 2018 21:50:10 +0000 (21:50 +0000)]
Merge "Fix illegal volume value issue"
Arthur Hsu [Thu, 18 Jan 2018 19:38:32 +0000 (19:38 +0000)]
Merge "Add config_supportBluetoothPersistedState."
Arthur Hsu [Thu, 11 Jan 2018 19:05:11 +0000 (11:05 -0800)]
Add config_supportBluetoothPersistedState.
Add a config to indicate whether a device supports Bluetooth persisted
state and defaulted to true. In ARC++, Bluetooth adapter state can be
out-of-sync from its container if the user changes it before the
container being available.
When set to false, this config prevents Android to auto start the
Bluetooth. ARC++ will set this to false and sync Bluetooth state later
with Android.
Related CL is ag/931281
Bug:
62413625,
69965109
Test: On sailfish, Bluetooth on/off correctly and state persisted across reboot
Change-Id: Ie298929eb6b882108a12e8b95f61e3c9f8eb63ea
Treehugger Robot [Thu, 18 Jan 2018 16:42:33 +0000 (16:42 +0000)]
Merge "Added APIs for Connection-oriented channels"
Neil Fuller [Thu, 18 Jan 2018 09:18:27 +0000 (09:18 +0000)]
Merge "Javadoc fixes to Time"
Holly Jiuyu Sun [Thu, 18 Jan 2018 03:32:22 +0000 (03:32 +0000)]
Merge "Add APIs to EuiccCardManager."
Jeff Sharkey [Thu, 18 Jan 2018 03:28:34 +0000 (03:28 +0000)]
Merge "Add "not congested" network capability."
Treehugger Robot [Thu, 18 Jan 2018 02:44:53 +0000 (02:44 +0000)]
Merge "Add basic resolution of Private DNS hostname"
Lorenzo Colitti [Thu, 18 Jan 2018 01:17:17 +0000 (01:17 +0000)]
Merge "Add public API methods for private DNS."
Treehugger Robot [Thu, 18 Jan 2018 00:46:57 +0000 (00:46 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()"
Holly Jiuyu Sun [Fri, 22 Dec 2017 02:44:59 +0000 (18:44 -0800)]
Add APIs to EuiccCardManager.
The CL contains parts of the EuiccCard APIs. getEid() is sync. All the
other APIs are async.
Move ResetOptions from EuiccCard to EuiccCardManager.
The other APIs will be added in a follow-up CL.
Bug:
38206971
Test: test on phone
Change-Id: Iba098ee779b8ea4e244e0e4cf7318139666cc94b
Treehugger Robot [Wed, 17 Jan 2018 23:58:10 +0000 (23:58 +0000)]
Merge "Reland: Move zygote's seccomp setup to post-fork"
Treehugger Robot [Wed, 17 Jan 2018 23:48:40 +0000 (23:48 +0000)]
Merge "Bluetooth in band ring"
Andy Hung [Wed, 17 Jan 2018 22:33:53 +0000 (22:33 +0000)]
Merge "Watchdog: add media.metrics"
Holly Jiuyu Sun [Wed, 17 Jan 2018 22:26:58 +0000 (22:26 +0000)]
Merge "Add APIs to EuiccCardManager and EuiccCardController."
Jack Yu [Wed, 17 Jan 2018 22:12:29 +0000 (22:12 +0000)]
Merge "Added data service interface"
Neil Fuller [Wed, 17 Jan 2018 21:13:21 +0000 (21:13 +0000)]
Javadoc fixes to Time
Fixing errors noticed while inspecting the code.
Test: None - docs only
Change-Id: Ib6d427c4339f0b8e56eb72b12e89c1095245d6b4
dalyk [Wed, 17 Jan 2018 19:20:55 +0000 (14:20 -0500)]
Add public API methods for private DNS.
Test: Small modifications to LinkProperties test.
Bug:
71828272
Change-Id: Id2f5acb5469132ec4a917837739f42085c71498e
Brad Ebinger [Wed, 17 Jan 2018 20:29:54 +0000 (20:29 +0000)]
Merge "Integrate IMS Registration API"
Treehugger Robot [Wed, 17 Jan 2018 19:50:40 +0000 (19:50 +0000)]
Merge "Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants."
Chen Xu [Wed, 17 Jan 2018 19:09:34 +0000 (19:09 +0000)]
Merge "new carrier id APIs"
nharold [Wed, 17 Jan 2018 19:07:10 +0000 (19:07 +0000)]
Merge "IpSec - API Tweak for removeTransportModeTransform"
Holly Jiuyu Sun [Fri, 22 Dec 2017 02:44:59 +0000 (18:44 -0800)]
Add APIs to EuiccCardManager and EuiccCardController.
Move CancelReason from EuiccCard to EuiccCardManager.
part 2.
Bug:
38206971
Test: test on phone
Change-Id: Iab61be59b7130a5336dffbc965eefefcfa3eccf6
Jack Yu [Tue, 28 Nov 2017 01:36:29 +0000 (17:36 -0800)]
Added data service interface
The interface for mobile data service. This is the base class
for vendor or first party data service provider to implement
the data service for cellular or IWLAN data support.
Test: Manual
bug:
64132030
Change-Id: I3e5f48b88905f4533cac60975802d4da3746e7f8
Treehugger Robot [Wed, 17 Jan 2018 17:33:41 +0000 (17:33 +0000)]
Merge "Skip SystemUI check in BluetoothServiceManager if noHome."
Victor Hsieh [Mon, 8 Jan 2018 20:43:00 +0000 (12:43 -0800)]
Reland: Move zygote's seccomp setup to post-fork
Before this change, seccomp filter setup is as early as in zygote's main
function. To make it possible to split app and system server's filter,
this postpone the setup to after fork. It also starts to call app
specific and system server specific setup function.
The filter setup is done in Zygote's ForkAndSpecializeCommon. This is
because adding a seccomp filter must be done when either the caller has
CAP_SYS_ADMIN or after the PR_SET_NO_NEW_PRIVS bit is set. Given that
setting PR_SET_NO_NEW_PRIVS breaks SELinux domain transition
(b/
71859146), this must be done after Zygote forks but before
CAP_SYS_ADMIN is droppped.
Test: (cts) -m CtsSecurityTestCases -t android.security.cts.SeccompTest
Test: no selinux denial flood in dmesg with selinux enforced
Test: debuggerd -b `pidof com.android.phone` # logcat shows tombstoned
received crash request
Bug:
63944145
Bug:
71859146
Change-Id: I8215c8530d3d0de504a270488f8e29635805e8b0
fionaxu [Tue, 28 Nov 2017 06:53:42 +0000 (22:53 -0800)]
new carrier id APIs
1. New telephony APIs to getCurrentCarrierId
and getCurrentCarrierName
2. New broadcast intent to notify carrier id changed
Bug:
64131637
Test: Build
Change-Id: I9a240ba7df313ad701f98bb3982f29c3d5317da8
(cherry picked from commit
fff6f59a63304be50e7a251fb4fca38ae0090fc4)
Merged-in: I9a240ba7df313ad701f98bb3982f29c3d5317da8
Erik Kline [Thu, 11 Jan 2018 12:07:29 +0000 (21:07 +0900)]
Add basic resolution of Private DNS hostname
Test: as follows
- built
- flashed
- booted
Bug:
34953048
Bug:
64133961
Change-Id: I0a2289ea51a9294352c91d2ead23730d9b0333a5
David Brazdil [Wed, 17 Jan 2018 13:42:29 +0000 (13:42 +0000)]
Merge "Pass targetSdkVersion to installd"
yuemingw [Tue, 16 Jan 2018 19:48:10 +0000 (19:48 +0000)]
Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants.
Test: manual
Bug:
68208245
Change-Id: I9416526f4a6e014dae66a936d6d1eb60309ef8ab
Pavlin Radoslavov [Wed, 17 Jan 2018 10:09:53 +0000 (02:09 -0800)]
Added internal API getMaxConnectedAudioDevices()
The API can be used to obtain the maximum number of connected
devices for A2DP or HFP.
Test: Manual
Bug:
64767509
Change-Id: I80b8a1c85e33ae0b23fdc4812f8991a4202d9abc
Jeff Sharkey [Wed, 17 Jan 2018 04:27:03 +0000 (13:27 +0900)]
Add "not congested" network capability.
Can be used by a network to indicate when it's congested, meaning that
apps should defer network traffic that could be done at a later time.
Test: bit FrameworksNetTests:android.net.,com.android.server.net.,com.android.server.connectivity.VpnTest,com.android.server.ConnectivityServiceTest
Bug:
64133169
Change-Id: I8a60b6f02dd0f42268b59690556c16335d34e220
Nathan Harold [Wed, 17 Jan 2018 09:00:20 +0000 (01:00 -0800)]
IpSec - API Tweak for removeTransportModeTransform
Because IpSecTransforms are now unidirectional,
and because the only mechanism for removing Transforms
removes it from both directions, the API can no longer
use the Transform parameter to meaningfully validate
that the caller had applied a transform. Since that
functionality was as-yet unimplemented and is now
infeasible, the transform parameter is removed.
Bug:
72079356
Test: cts - IpSecManagerTest; runtest frameworks-net
Change-Id: If19b0d34bdc6daf31a40d6d62bff326dcbca08c0
nharold [Wed, 17 Jan 2018 08:45:29 +0000 (08:45 +0000)]
Merge "Prevent Closure of Underlying Socket FDs"
nharold [Wed, 17 Jan 2018 08:40:37 +0000 (08:40 +0000)]
Merge changes from topic "ipsec-oneway-transform"
* changes:
Update IpSecService UnitTests
Make Transforms Unidirectional
Nathan Harold [Tue, 16 Jan 2018 20:08:43 +0000 (12:08 -0800)]
Prevent Closure of Underlying Socket FDs
The version of applyTransportModeTransform() and
removeTransportModeTransform() that accepted
Socket and DatagramSocket were closing the underlying
FDs upon return. It's unclear whether this is due to
a behavior change elsewhere in ParcelFileDescriptor,
but either way, converting to using getFileDescriptor$
and then calling dup() explicitly rather than relying
on ParcelFileDescriptor seems like a better idea anyway.
Bug:
72047396
Test: CTS - IpSecManagerTest.testCreateTransform()
Change-Id: Ia2f02564e1289f25bf113dbb861fcfd2240537a7
nharold [Wed, 17 Jan 2018 03:39:44 +0000 (03:39 +0000)]
Merge "Update documentation for KEY_CARRIER_NAME_STRING"
Nathan Harold [Wed, 17 Jan 2018 03:34:01 +0000 (19:34 -0800)]
Update IpSecService UnitTests
The IpSecService Unit tests relied on the
directionality of the IpSecConfig and previously
did not specify a source address. Unit tests
updated without functional change other than to
address these two requirements.
Bug:
71717213
Test: runtest frameworks-net
Change-Id: Iedbed735bc50fd4fdfe985f9e173956062a7b0d1
Ryan Lothian [Tue, 16 Jan 2018 23:31:41 +0000 (23:31 +0000)]
Merge "Handle onBindingDied in notification manager"
Ryan Lothian [Mon, 4 Dec 2017 16:56:58 +0000 (11:56 -0500)]
Handle onBindingDied in notification manager
On Android, if the process containing the service being bound to
crashes before the bind succeeds, the app doing the binding won't
get a success or failure callback.
When that happens in this code, this leaves notif. manager thinking
that a binding is in progress, so it never attempts to rebind until
the device is rebooted.
Bug:
69064494
Test: original CL was manually tested --
crashed listener on proc start, verified not unbound forever
Change-Id: Id2082744208e21a709d9453365f282449a2e9407
(cherry picked from commit
4a86a51b672617b02994fc812e4f96342daf424e)
David Brazdil [Tue, 16 Jan 2018 20:01:47 +0000 (20:01 +0000)]
Pass targetSdkVersion to installd
Dex2oat now accepts targetSdkVersion as a parameter to determine
whether ART should treat the app as "legacy" and allow or restrict
access to private APIs.
We also bump arguments of otapreopt to v4 to accommodate the new value.
Bug:
64382372
Test: manual
Change-Id: Iae3867325dfaf8deaba51626ab04b97ad797d3b6
Ivan Lozano [Tue, 16 Jan 2018 20:27:36 +0000 (20:27 +0000)]
Merge "Fix doFadingAnimationLocked in sanitized builds."
Nathan Harold [Sat, 6 Jan 2018 03:25:13 +0000 (19:25 -0800)]
Make Transforms Unidirectional
Convert the IpSecTransform from being a bi-directional
pair of SAs to a unidirectional single SA. This CL
also removes the concept of "direction from SAs meaning
that a IpSecTransform may now be applied to a socket
in either direction.
-Make transforms unidirectional
-Add Convert allocateSpi() to use destination rather
than direction and remote address
-Remove directionality from builders for IpSecTransform
-Change applyTransportModeTransform() to take a
direction in which to apply the transform object.
-Additional minor naming updates
-Restrict IpSecConfig to only print keys on eng builds
-Move DIRECTION constants to IpSecManager
-Add sourceAddress parameter to IpSecTransform to provide
additional guarantees about the source address of data;
(explicit failure rather than implicit failure).
-Move SPI to the build() method of IpSecTransform
Bug:
71717213
Test: runtest frameworks-net, CTS - IpSecManagerTest
Change-Id: I0824b37f443f4b8c62536d9801238c63ed8f2a1c
Treehugger Robot [Tue, 16 Jan 2018 18:25:32 +0000 (18:25 +0000)]
Merge "ActivityThread: Attempt to attach agent with app's classloader"
Brad Ebinger [Thu, 14 Dec 2017 22:22:27 +0000 (14:22 -0800)]
Integrate IMS Registration API
Integrates the new IMS Registration API into the framework
and add two APIs for feature parity.
1) Moves ImsRegistrationImplBase to the android.telephony.ims
namespace
2) Expose ImsRegistration AIDL in TelephonyManager as hidden
API.
3) Adds onVoicemailCountUpdate and
onSubscriberAssociatedUriChanged APIs for feature parity.
Bug:
63987047
Test: Telephony unit tests, manual IMS tests
Merged-In: I51a8ae5cf58b81708c21adc1b26a9eb59f6280fd
Change-Id: I51a8ae5cf58b81708c21adc1b26a9eb59f6280fd
Treehugger Robot [Tue, 16 Jan 2018 14:25:13 +0000 (14:25 +0000)]
Merge changes I0d0c0fac,Ifb9b00b6
* changes:
Split updateCapabilities into two methods.
More strictly check NetworkCapabilities callbacks.
Lorenzo Colitti [Mon, 15 Jan 2018 15:52:07 +0000 (00:52 +0900)]
Split updateCapabilities into two methods.
This makes the code a bit easier to follow.
Test: ConnectivityServiceTest continues to pass
Change-Id: I0d0c0facc1e3ba07b53542b35da40ddc096ff92e
Treehugger Robot [Tue, 16 Jan 2018 12:23:02 +0000 (12:23 +0000)]
Merge "Update netId to nethandle mapping in NetworkTest."
Paul Duffin [Tue, 16 Jan 2018 10:47:47 +0000 (10:47 +0000)]
Merge "Replace legacy-test with android.test.base in bp files"
Lorenzo Colitti [Tue, 16 Jan 2018 08:18:17 +0000 (17:18 +0900)]
Update netId to nethandle mapping in NetworkTest.
Bug:
63052780
Test: NetworkTest now passes
Change-Id: I5f1cb3055b7042a19afb5dd62f082912157612ba
Hugo Benichi [Tue, 16 Jan 2018 07:10:50 +0000 (07:10 +0000)]
Merge "MacAddress: add @NonNull annotations"
Hugo Benichi [Fri, 12 Jan 2018 00:46:29 +0000 (09:46 +0900)]
MacAddress: add @NonNull annotations
This patch adds to the MacAddress class:
- getAddressType() method which replaces addressType(), for naming
consistency
- @NonNull annotations on all input and output reference values for
all public methods (@hide and public).
TYPE_UNKNOWN, which currently cannot be observed with a non @hide
method, is also removed from the public api.
Bug:
71866627
Test: $ runtest frameworks-net
Change-Id: I2af70408d46f431b7b32183e6b48ddae9a261a2c
Treehugger Robot [Tue, 16 Jan 2018 02:58:56 +0000 (02:58 +0000)]
Merge "Change the netId to nethandle mapping."
Hugo Benichi [Tue, 16 Jan 2018 00:20:52 +0000 (00:20 +0000)]
Merge "ConnectivityService: synchronize access on mLockdownEnabled"
Andreas Gampe [Fri, 5 Jan 2018 21:55:15 +0000 (13:55 -0800)]
ActivityThread: Attempt to attach agent with app's classloader
Try to use the app's (main) classloader when an attach-agent request
is handled. If that fails, retry without a classloader.
Add bind-application-time flag to ProfilerInfo. Use the flag to have
a second attach-agent point on app startup. Add --attach-agent-bind
to cmd activity start to expose the difference between pre-bind and
bind-time attaching.
Bug:
70901841
Test: m
Test: cts-tradefed run commandAndExit cts-dev -m CtsJvmtiAttachingHostTestCases
Change-Id: I21698ec3be43a6d095d577100b2adfb22daca7d5
Nathan Harold [Mon, 15 Jan 2018 18:48:00 +0000 (10:48 -0800)]
Update documentation for KEY_CARRIER_NAME_STRING
The documentation for KEY_CARRIER_NAME_STRING was out
of date; documentation updated to support the additional
use case of "fallback" carrier name when SPN is
unavailable.
Bug:
71882065
Test: compilation (docstring-only change)
Change-Id: I8e6a44358f8b18384c3c6e3cc0964e94c2484a11
Lorenzo Colitti [Tue, 5 Sep 2017 02:15:37 +0000 (11:15 +0900)]
Change the netId to nethandle mapping.
Being able to update this handle is necessary to ensure that
system-only OTAs do not break vendor code that relies on
nethandles.
Bug:
63052780
Test: walleye builds, boots, networking works
Test: MultinetworkApiTest CTS tests passes
Change-Id: I049a4ad2610ca68b8f56377b63be7e5e8ce76039
Paul Duffin [Mon, 15 Jan 2018 15:47:47 +0000 (15:47 +0000)]
Replace legacy-test with android.test.base in bp files
The legacy-test target is deprecated and will be replaced by
android.test.base. This replaces a few usages of the legacy-test target
in Android.bp files with android.test.base.
Bug:
30188076
Test: make checkbuild
Change-Id: I3575f638114fe2a3b703e67837496346bde24472
Lorenzo Colitti [Fri, 12 Jan 2018 07:22:21 +0000 (16:22 +0900)]
More strictly check NetworkCapabilities callbacks.
This change more strictly accounts for onCapabilitiesChanged
callbaks and their values. It exposes several cases where we the
callbacks we send are spurious.
Test: ConnectivityServiceTest continues to pass
Change-Id: Ifb9b00b6f0cae48f8ed41a525100d1744b5f429b
vichang [Mon, 15 Jan 2018 13:55:54 +0000 (13:55 +0000)]
Merge "Add a new API android.icu.util.LocaleData"
Treehugger Robot [Mon, 15 Jan 2018 12:39:09 +0000 (12:39 +0000)]
Merge "change NMS removeNetwork to netd binder variant"
vichang [Mon, 15 Jan 2018 11:56:58 +0000 (11:56 +0000)]
Merge "Expose API android.icu.util.IllformedLocaleException"
Erik Kline [Mon, 15 Jan 2018 08:05:07 +0000 (17:05 +0900)]
change NMS removeNetwork to netd binder variant
Also: require NETWORK_STACK instead of CONNECTIVITY_INTERNAL.
Bug:
34953048
Bug:
64133961
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net
Change-Id: I26f07f51a8a2f4a8bb43a276da7c5e66c355c848
Paul Duffin [Sat, 13 Jan 2018 19:33:39 +0000 (19:33 +0000)]
Merge "Remove junit classes from legacy-android-test"
Paul Duffin [Fri, 12 Jan 2018 16:08:35 +0000 (16:08 +0000)]
Remove junit classes from legacy-android-test
A mistake during the conversion of the legacy-android-test target from
Android.mk to Android.bp caused some junit classes to be accidentally
included in the legacy-android-test target. That caused some warnings
about duplicate classes to be output during the build.
The junit classes are being included as part of the static library
android.test.runner. This fixes that by adding a new
android.test.runner-minus-junit which excludes the junit classes
and then using that instead.
Test: make checkbuild
Change-Id: Icd00b38c64d3416a55c1055f9716ddb78ec278f8
Paul Duffin [Sat, 13 Jan 2018 09:33:05 +0000 (09:33 +0000)]
Merge changes from topic "fix-legacy-android-test-spam"
* changes:
Added new android.test.base targets
Move legacy-test to test-base
Treehugger Robot [Sat, 13 Jan 2018 04:09:42 +0000 (04:09 +0000)]
Merge "Add the user mobile data state into PhoneStateListener so that applications can listen to the change of the user mobile data state."
Treehugger Robot [Sat, 13 Jan 2018 01:42:52 +0000 (01:42 +0000)]
Merge "Used LinkAddress insteaad of InterfaceAddress"
Ivan Lozano [Thu, 14 Dec 2017 20:25:36 +0000 (12:25 -0800)]
Fix doFadingAnimationLocked in sanitized builds.
The loop as constructed causes i to overflow twice when i = 0 on integer
overflow sanitized builds.
runtime error: unsigned integer overflow: 0 - 1 cannot be represented
in type 'size_t' (aka 'unsigned long')
runtime error: unsigned integer overflow:
18446744073709551615 + 1
cannot be represented in type 'size_t' (aka 'unsigned long')
This refactors the loop to avoid the overflows.
Bug:
30969751
Test: Compiles, device boots, enabled pointer location overlay.
Change-Id: I844bb3b84b1f536c50d06fb489fcc22590d4aa98
Merged-In: I844bb3b84b1f536c50d06fb489fcc22590d4aa98
(cherry picked from commit
7ee0dba09550811040df4d7b494766f7d146e3de)
Sanket Padawe [Fri, 12 Jan 2018 23:50:40 +0000 (23:50 +0000)]
Merge "Add permission check for old call handover apis."
Treehugger Robot [Fri, 12 Jan 2018 22:12:39 +0000 (22:12 +0000)]
Merge "android.os.VintfObject: update for VNDK version format change."
Joseph Pirozzo [Fri, 12 Jan 2018 22:11:50 +0000 (22:11 +0000)]
Merge "Bluetooth in band ring"
Hall Liu [Fri, 12 Jan 2018 20:56:36 +0000 (20:56 +0000)]
Merge "Use proper classloader when reading from parcel"
Treehugger Robot [Fri, 12 Jan 2018 20:52:14 +0000 (20:52 +0000)]
Merge "Minor LoadedApk refactoring."
Jack Yu [Thu, 11 Jan 2018 20:44:07 +0000 (12:44 -0800)]
Used LinkAddress insteaad of InterfaceAddress
Also removed InterfaceAddress which was added
in aosp/561351 since LinkAddress is exactly same
as InterfaceAddress.
Test: Telephony sanity tests
bug:
64132030
Merged-In: Ib7965a44b307c4cff2581abf0b7c12fcb1b9526a
Change-Id: Ib7965a44b307c4cff2581abf0b7c12fcb1b9526a
Jeff Hamilton [Tue, 24 Oct 2017 19:20:43 +0000 (15:20 -0400)]
Minor LoadedApk refactoring.
- Rename varaibles holding LoadedApk to make the code easier to read.
- Move resource creation into LoadedApk, consolidating the logic.
(cherry picked from commit
7541ca4d1aa48e3110187a83a8dccbfa72084148)
Test: manual
Merged-In: I6bdc70482fbbb346ff694ada528ded18d3a63ef7
Change-Id: I6bdc70482fbbb346ff694ada528ded18d3a63ef7
Sanket Padawe [Fri, 5 Jan 2018 22:26:16 +0000 (14:26 -0800)]
Add permission check for old call handover apis.
Bug:
65415068
Test: manual
Change-Id: I4784debf1be255de24c341fe5474fc529bc1cebe
Holly Jiuyu Sun [Fri, 12 Jan 2018 17:18:03 +0000 (17:18 +0000)]
Merge "Add dependencies of EuiccCard."
Paul Duffin [Thu, 16 Nov 2017 15:53:09 +0000 (15:53 +0000)]
Added new android.test.base targets
Renames ...-legacy-test-... targets related to stubs generation to
...-android-test-base-....
(cherry picked from commit
5c99382a1995723637814221cd5432c458c622ad)
Bug:
30188076
Test: make checkbuild
Change-Id: I40b39c5250b7d990a903052c0b1ebd694242b5b3
Merged-Id: I54204733612d6d3f14dd8023973e993a5ddab51d
Paul Duffin [Thu, 16 Nov 2017 15:47:05 +0000 (15:47 +0000)]
Move legacy-test to test-base
Make it consistent with the test-mock and test-runner directories.
Also renames the files in api/ subdirectory.
(cherry picked from commit
f779efd62cd579f67bd3b387d59fda11ee0cbe90)
Bug:
30188076
Test: make checkbuild
Change-Id: Ied3621e6201d8717223fe1ccd4ea77d458126b25
Merged-In: If4f99a65fcca416ede5b3e63481398f0b451bcb7
Badhri Jagan Sridharan [Fri, 12 Jan 2018 15:36:08 +0000 (15:36 +0000)]
Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager"
Jerry Zhang [Fri, 1 Dec 2017 03:10:55 +0000 (19:10 -0800)]
DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager
Cherry-pick from
30b9adfad1c5055044f0b585782b10f764e0ddf9
The screen unlocked functions save effort on setting
the usb config during each connection. These
functions persist between connections and between
boots. When the screen is unlocked and these
functions are set, the current functions will
be automatically set to the screen unlocked functions.
Also added svc command for this so it can be
used and tested while the UI is worked on.
Bug:
62876645
Test: svc usb setScreenUnlockedFunctions mtp
Test: Test functions with locking, unlocking, and
disconnecting, with no lockscreen, swipe, and pattern
Change-Id: Ia05e095917166d25398c4d310b02971e3a1bb12a
Stanley Tng [Thu, 23 Nov 2017 00:04:40 +0000 (16:04 -0800)]
Added APIs for Connection-oriented channels
Experimental and hidden APIs are defined for the Connection-oriented Channel
(CoC) features. The APIs using PSM are implemented.
Test: Can compile
Bug:
70683224
Change-Id: Icdb5fa190b0e21881a60437fa48cd575371ee1e4
Treehugger Robot [Fri, 12 Jan 2018 12:39:35 +0000 (12:39 +0000)]
Merge "base: Convert libs/services/Android.mk into a blueprint"
Sami Kyostila [Thu, 11 Jan 2018 00:12:14 +0000 (00:12 +0000)]
base: Convert libs/services/Android.mk into a blueprint
Convert libs/services/Android.mk into a blueprint module so it can be
linked by other blueprint modules.
Test: mmm frameworks/base
Change-Id: I7acf9aa084d262a5aba5a58e45d9647e15c6dffb
Merged-In: I7acf9aa084d262a5aba5a58e45d9647e15c6dffb
Chalard Jean [Fri, 12 Jan 2018 05:11:29 +0000 (05:11 +0000)]
Merge "Readability improvements to the Vpn class with no logic changes"
Hall Liu [Fri, 12 Jan 2018 01:23:40 +0000 (17:23 -0800)]
Use proper classloader when reading from parcel
Use the proper classloader when loading ImsStreamMediaProfile from a
parcel.
Bug:
71873453
Test: manual
Change-Id: Idf60f18b5d25b4c8eae225cb92a5391303c86d3b
Arthur Hsu [Fri, 12 Jan 2018 00:46:22 +0000 (16:46 -0800)]
Skip SystemUI check in BluetoothServiceManager if noHome.
When device is configured with config_noHomeScreen, there will be no
SystemUI. Checking SystemUI UID is meaningless.
Bug:
62413935 69965109
Test: On sailfish, logcat shows expected SystemUI UID by default
Change-Id: Iaccc0f10cb82da454077056824c3f6eea6a37c4e
Treehugger Robot [Thu, 11 Jan 2018 23:52:46 +0000 (23:52 +0000)]
Merge "Frameworks: Move SharedPreferencesImpl to tristate"
Jerry Zhang [Thu, 11 Jan 2018 23:50:34 +0000 (23:50 +0000)]
Merge "DO NOT MERGE: Add ScreenObserver"
Yifan Hong [Thu, 11 Jan 2018 00:04:18 +0000 (16:04 -0800)]
android.os.VintfObject: update for VNDK version format change.
Test: CTS device info collect
Bug:
36400653
Change-Id: I7b22f82ddd9ddc3b0930b5c1564435c42be2a6fa
Treehugger Robot [Thu, 11 Jan 2018 22:43:10 +0000 (22:43 +0000)]
Merge "Add new config for number of physical SIM slots on the device."
Joseph Pirozzo [Wed, 3 Jan 2018 16:59:57 +0000 (08:59 -0800)]
Bluetooth in band ring
Add a flag to the BluetoothHeadsetClientCall indicating the current
status of in band ring on the connected phone.
Bug:
65673832
Test: runtest bluetooth -c
com.android.bluetooth.hfpclient.HeadsetClientStateMachineTest
Change-Id: I7e839f2790b1a27d336528e93bc8a4c8d8ff3036
(cherry picked from commit
f780364a9a1f6171860cbdf4e1b41a01ee7d88c6)
Joseph Pirozzo [Wed, 3 Jan 2018 00:15:23 +0000 (16:15 -0800)]
Bluetooth in band ring
Prevent the telecom service from generating a ringer if there is already
a ringer generated by a phone connected over bluetooth headset client
service.
Bug:
65673832
Test: runtest telecom-unit -c
com.android.server.telecom.tests.RingerTest
Change-Id: I40710787cab0215f0456153a3557aa8cf1a50cdf
(cherry picked from commit
40ea5eea4194f56f63e6aa3383772f462306c02a)
Holly Jiuyu Sun [Thu, 11 Jan 2018 20:44:33 +0000 (20:44 +0000)]
Merge "Add EuiccCardManager and EuiccCardController."
Treehugger Robot [Thu, 11 Jan 2018 20:22:05 +0000 (20:22 +0000)]
Merge "Make Bluetooth constants used by gmscore a system api"
Jerry Zhang [Thu, 11 Jan 2018 18:46:13 +0000 (10:46 -0800)]
DO NOT MERGE: Add ScreenObserver
ScreenObserver allows system components to
monitor the screen lock state.
Bug:
68054513
Test: manual
Change-Id: I50f4690f68443f676d17e93efb1b7cb0857abd9e
Holly Jiuyu Sun [Fri, 22 Dec 2017 02:44:59 +0000 (18:44 -0800)]
Add EuiccCardManager and EuiccCardController.
EuiccCardManager is in the same path with EuiccManager.
EuiccCardController is in the same path with EuiccController.
Use getAllProfiles() as an example interface.
The implementation of EuiccCard and its content will be added in a
follow up CL.
The new API is marked as @hide and TODO for @SystemApi.
Bug:
38206971
Test: test on phone
Change-Id: I153937c0f79bdd1a00b06b234a6e254a3f43072c
Merged-In: I153937c0f79bdd1a00b06b234a6e254a3f43072c
Badhri Jagan Sridharan [Thu, 11 Jan 2018 17:53:11 +0000 (17:53 +0000)]
Merge "Overcome disconnect during oem override"
Treehugger Robot [Thu, 11 Jan 2018 11:33:30 +0000 (11:33 +0000)]
Merge changes I47ccfa99,I5db1de3e
* changes:
Extract DNS setting logic into DnsManager class
Add minimal test for setting DNS properties