OSDN Git Service
Pavlin Radoslavov [Sat, 10 Feb 2018 09:16:20 +0000 (09:16 +0000)]
Merge "Use proper string formatting for the "Active device" string"
am:
1b5703f9e9
Change-Id: I53fcb586273b02339e83f2514274e3be662b67ba
Treehugger Robot [Sat, 10 Feb 2018 02:05:12 +0000 (02:05 +0000)]
Merge "Use proper string formatting for the "Active device" string"
Tyler Gunn [Sat, 10 Feb 2018 01:52:07 +0000 (01:52 +0000)]
Merge "Add InCallService docs to state prerequisites for be being a dialer app."
am:
6a3031713c
Change-Id: I08fb54de452d6f334232d24caf8f89caba85c515
nharold [Sat, 10 Feb 2018 01:46:00 +0000 (01:46 +0000)]
Merge "Require NETWORK_STACK Permission for IpSec Tunnel Mode"
am:
43699e90f3
Change-Id: I1f286f0215ce88f947775ded0ddfbc8e0cd7bc55
Tyler Gunn [Sat, 10 Feb 2018 00:00:04 +0000 (00:00 +0000)]
Merge "Add InCallService docs to state prerequisites for be being a dialer app."
Tyler Gunn [Fri, 9 Feb 2018 23:59:33 +0000 (23:59 +0000)]
Merge "Add Connection Event for supplementary service notifications."
am:
efccc1babe
Change-Id: Ia8f03045830032e42d2518e97fe74fd55734d524
nharold [Fri, 9 Feb 2018 23:36:59 +0000 (23:36 +0000)]
Merge "Require NETWORK_STACK Permission for IpSec Tunnel Mode"
Pavlin Radoslavov [Tue, 6 Feb 2018 20:21:34 +0000 (12:21 -0800)]
Use proper string formatting for the "Active device" string
* The hard-coded "active" / "active(media)" / "active(phone)" strings
are removed and replaced with proper XML-based string formatting.
* Added the appropriate strings for Bluetooth Audio Active Device status:
"bluetooth_audio_active_device_summaries". For now those strings are
marked as translatable="false" until the actual UI is finalized.
* Updated all "bluetooth_connected*" strings to include the new
"active_device" component.
* Added unit tests for the new "active" strings.
Also, updated existing unit tests to check the getConnectionSummary()
strings by comparing against strings embedded within the unit tests.
Bug:
72317067
Test: Unit tests added: make RunSettingsLibRoboTests -j40
Manual: two headsets and switching the active device
Change-Id: Ide639b5dfb45c1db8114155240f193249aeaf3be
(cherry picked from commit
e6e080ff5cb9c7c56003695c1b787981e0114599)
Tyler Gunn [Fri, 9 Feb 2018 22:10:50 +0000 (22:10 +0000)]
Merge "Add Connection Event for supplementary service notifications."
Adam Lesinski [Fri, 9 Feb 2018 22:00:21 +0000 (22:00 +0000)]
Merge "Remove redundant final modifiers from api"
am:
0ac66edaea
Change-Id: I69d90dc2869943544e88ed01391d4a6b1107aa90
Andreas Gampe [Fri, 9 Feb 2018 21:46:16 +0000 (21:46 +0000)]
Merge "Watchdog: Print annotated stack trace, if possible"
am:
2bd33a69d9
Change-Id: I618fcab94211da7b259b4761faeb26daea658a48
Tyler Gunn [Fri, 9 Feb 2018 21:42:29 +0000 (21:42 +0000)]
Merge "Pass calling package for invocations of endCall API."
am:
44289caa11
Change-Id: Ifc44839a3235755e9f231f37dd99f22bb96b39a9
Adam Lesinski [Fri, 9 Feb 2018 20:48:28 +0000 (20:48 +0000)]
Merge "Remove redundant final modifiers from api"
Tyler Gunn [Fri, 2 Feb 2018 21:18:02 +0000 (13:18 -0800)]
Add InCallService docs to state prerequisites for be being a dialer app.
The InCallService documentation does not clearly state that an app which
wants to become the default dialer app also needs to handle the DIAL
intent. This change updates the documentation to make this clear.
Test: Built documentation and verified its contents.
Bug:
72857373
Change-Id: I738a8475df37035a0a7f4ad1639df76d967f81dc
Treehugger Robot [Fri, 9 Feb 2018 19:24:03 +0000 (19:24 +0000)]
Merge "Watchdog: Print annotated stack trace, if possible"
Tyler Gunn [Fri, 9 Feb 2018 18:49:08 +0000 (18:49 +0000)]
Merge "Pass calling package for invocations of endCall API."
tiansiming [田思明] [Fri, 9 Feb 2018 06:28:30 +0000 (06:28 +0000)]
Merge "Modify javadoc for onWindowShown"
am:
2d46e07e48
Change-Id: I126b0bcfbc5d1d10cad7564e7f8c8a7e419b96c6
Andreas Gampe [Fri, 26 Jan 2018 19:39:46 +0000 (11:39 -0800)]
Watchdog: Print annotated stack trace, if possible
Use VMStack.getAnnotatedStackTrace() to print an annotated stack.
Aids in diagnostics of watchdog aborts.
Bug:
70538431
Test: m
Test: art/test/testrunner/testrunner.py -b --host -t 168
Test: runtest -c com.android.server.WatchdogDiagnosticsTest frameworks-services
Test: manual - insert a deadlock into ActivityManagerService
Change-Id: I5bd43920edb8b569240432b6f299e56cabf5ef2a
yunseon.park [Fri, 9 Feb 2018 03:55:29 +0000 (03:55 +0000)]
Merge "Set the WebViewLoader's targetSdk same with framework's."
am:
d7187c90d0
Change-Id: I98f83e81e2d4081288d3c4ac07732c1f3716beb5
Treehugger Robot [Fri, 9 Feb 2018 03:50:05 +0000 (03:50 +0000)]
Merge "Modify javadoc for onWindowShown"
Yifan Hong [Fri, 9 Feb 2018 00:33:38 +0000 (00:33 +0000)]
Merge "VintfObject: add getTargetFcmVersion"
am:
5a748e5ee2
Change-Id: I902bf93cb06bdbab8aba58e41db8eb71a066dbb6
Tyler Gunn [Wed, 20 Dec 2017 23:59:15 +0000 (15:59 -0800)]
Add Connection Event for supplementary service notifications.
These are passed up to the UI with an optional charsequence message which
the UI can choose to display to the user.
Test: Manual, added new unit tests
Bug:
65534165
Change-Id: Icdf2738ac4dfd3a65e9eacac2caa4d4a44348ab4
Nathan Harold [Sat, 3 Feb 2018 02:34:25 +0000 (18:34 -0800)]
Require NETWORK_STACK Permission for IpSec Tunnel Mode
At least until further permissions are agreed upon,
the NETWORK_STACK permission is sufficient to ensure
that access to the tunnel mode APIs is secure, and
this permission will always be a sufficient condition.
Thus, adding NETWORK_STACK.
Bug:
66955045
Test: compilation
Change-Id: I2dc36896a52d2e71fad55041507d68ca91191ffc
Treehugger Robot [Thu, 8 Feb 2018 21:12:46 +0000 (21:12 +0000)]
Merge "Set the WebViewLoader's targetSdk same with framework's."
Treehugger Robot [Thu, 8 Feb 2018 20:12:02 +0000 (20:12 +0000)]
Merge "VintfObject: add getTargetFcmVersion"
goneil [Thu, 8 Feb 2018 02:21:01 +0000 (02:21 +0000)]
Merge "Make TelephonyManager#getNai() public"
am:
4c8fa81d17
Change-Id: Ie219d338df42cf4593545180691759426616ade4
Pooja Jain [Thu, 8 Feb 2018 01:00:43 +0000 (01:00 +0000)]
Merge "IMS: Add support in frameworks for call deflection feature"
am:
ba0f9d2973
Change-Id: I6e209e21e46ce8127019d08cf59bda5d5bdd919e
Tyler Gunn [Thu, 8 Feb 2018 00:08:27 +0000 (16:08 -0800)]
Pass calling package for invocations of endCall API.
Pass the calling package for debugging purposes.
Test: Manual
Bug:
73006395
Change-Id: I5ea7f1f0033438de3cdc2c47fc8a03f05d9e4590
Treehugger Robot [Wed, 7 Feb 2018 23:17:18 +0000 (23:17 +0000)]
Merge "Make TelephonyManager#getNai() public"
Yifan Hong [Wed, 7 Feb 2018 22:16:21 +0000 (14:16 -0800)]
VintfObject: add getTargetFcmVersion
Add getTargetFrameworkCompatibilityMatrixVersion that returns
target FCM version in device manifest.
Test: VintfDeviceInfo
Bug:
70993015
Change-Id: Ia6354f85e7fae898444067977fb594febb0112fa
Treehugger Robot [Wed, 7 Feb 2018 22:25:04 +0000 (22:25 +0000)]
Merge "IMS: Add support in frameworks for call deflection feature"
Martijn Coenen [Wed, 7 Feb 2018 16:12:04 +0000 (16:12 +0000)]
Merge "Fix gNumProxies double increment."
am:
18f8500e32
Change-Id: I1cc29693fd50fc033342c592841a17dbd5b9d532
tiansiming [田思明] [Mon, 5 Feb 2018 10:28:28 +0000 (18:28 +0800)]
Modify javadoc for onWindowShown
onWindowShown is more like it should called after mWindow.show()
in InputMethodService. Considering the compatibility problem, just
make its javadoc clearer to the IME developers rather than
change the calling order.
Bug:
72922821
Test: N/A
Change-Id: Ibfe20f40a65475f39c8e79d10e2c494e212cf054
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com>
Martijn Coenen [Wed, 7 Feb 2018 13:47:45 +0000 (13:47 +0000)]
Merge "Fix gNumProxies double increment."
Martijn Coenen [Wed, 7 Feb 2018 09:25:39 +0000 (10:25 +0100)]
Fix gNumProxies double increment.
Bug:
70217678
Test: proxy counts look reasonable
Change-Id: I6147d6038794eabd6b3446d78cd29af9d40ef7cc
Pooja Jain [Thu, 28 Dec 2017 08:45:31 +0000 (14:15 +0530)]
IMS: Add support in frameworks for call deflection feature
Call deflection feature is useful to deflect MT call to another
number.
Test: Manual
Bug:
62170348
Change-Id: Idfbcc175a856aa0bb9476f8c73d7a614a3af0700
Jong Wook Kim [Wed, 7 Feb 2018 05:20:19 +0000 (05:20 +0000)]
Merge "MacAddress: Use SecureRandom and add a 46 bit randomized MAC generator"
am:
9f16828767
Change-Id: If35e07b78b17329a25cf78adbf3d8244af4a4f81
Gurpreet Ghai [Wed, 7 Feb 2018 03:59:38 +0000 (03:59 +0000)]
Merge "Fix ANR due to long wait for synchronization lock"
am:
9193014ee6
Change-Id: Ic41c34a5701658aa328a83267ad3c818d55bd522
Siyuan Zhou [Wed, 7 Feb 2018 03:52:30 +0000 (03:52 +0000)]
Merge "BootReceiver: changed deprecated Build.RADIO to Build.getRadioVerison to get non-empty radio firmware version in SYSTEM_LAST_KMSG."
am:
1a535ba4b9
Change-Id: Iea3ef90603b4aa6da9a24839e8ec16a996a5d5e5
Jong Wook Kim [Wed, 7 Feb 2018 02:06:07 +0000 (02:06 +0000)]
Merge "MacAddress: Use SecureRandom and add a 46 bit randomized MAC generator"
Jong Wook Kim [Thu, 1 Feb 2018 03:03:19 +0000 (19:03 -0800)]
MacAddress: Use SecureRandom and add a 46 bit randomized MAC generator
Use SecureRandom instead of Random since Random is time based and can
increase the chance of generating same MAC address across multiple
devices.
createRandomUnicastAddress should randomize all bits of the address,
except for locally assigned bit and unicast bit. The previous method
that only randomizes NIC and use Google Base OUI is renamed to
createRandomUnicastAddressWithGoogleBase.
Bug:
72450936
Test: runtest frameworks-net
Change-Id: Icda650638c2c1c9fd90d509a87e86347c0e05f2d
Treehugger Robot [Wed, 7 Feb 2018 01:26:09 +0000 (01:26 +0000)]
Merge "Fix ANR due to long wait for synchronization lock"
Treehugger Robot [Wed, 7 Feb 2018 01:24:36 +0000 (01:24 +0000)]
Merge "BootReceiver: changed deprecated Build.RADIO to Build.getRadioVerison to get non-empty radio firmware version in SYSTEM_LAST_KMSG."
Tobias Thierer [Wed, 7 Feb 2018 01:20:35 +0000 (01:20 +0000)]
Merge "Pin jarjar targets to java_version 1.8."
am:
2bbf12aa78
Change-Id: Ic5dbc60063d92bafca7fef8cebc03fe449ccc224
Tobias Thierer [Wed, 7 Feb 2018 00:16:04 +0000 (00:16 +0000)]
Merge "Pin jarjar targets to java_version 1.8."
Xiangyu/Malcolm Chen [Tue, 6 Feb 2018 22:56:48 +0000 (22:56 +0000)]
Merge "Update ServiceState to adapt NetworkService change."
am:
1168c31c4a
Change-Id: Ibbe75b8f9f9498d71fda5e03932439c7832454a6
Hall Liu [Tue, 6 Feb 2018 22:50:34 +0000 (22:50 +0000)]
Merge "Revert "Check for location access on TelephonyRegistry""
am:
39393f889a
Change-Id: I74a817ac04cc754a291521ae03fcf648b00494f9
Adam Lesinski [Tue, 6 Feb 2018 22:45:33 +0000 (14:45 -0800)]
Remove redundant final modifiers from api
This change is the result of running
make update-api
with the related doclava change in this topic.
Test: manual
Merged-In: I193781c281fbde13ccdaedeaee30f8d7c3b5f33e
Change-Id: I174874dc0af9deda6d88dced5871aa8add05d5fa
Malcolm Chen [Tue, 6 Feb 2018 22:28:41 +0000 (22:28 +0000)]
Merge "Add strings and carrier config needed network service."
am:
a3ccb8d854
Change-Id: Id72bfe77c515028a055268bf9ba2d23e7b310d3e
Colin Cross [Tue, 6 Feb 2018 22:22:19 +0000 (22:22 +0000)]
Merge "Add missing copyright messages"
am:
872f386f6b
Change-Id: If54622ff6ed84dca262a8e65deb44bacbfc5b280
Xiangyu/Malcolm Chen [Tue, 6 Feb 2018 21:32:31 +0000 (21:32 +0000)]
Merge "Update ServiceState to adapt NetworkService change."
Hall Liu [Tue, 6 Feb 2018 21:15:42 +0000 (21:15 +0000)]
Merge "Revert "Check for location access on TelephonyRegistry""
Treehugger Robot [Tue, 6 Feb 2018 20:57:25 +0000 (20:57 +0000)]
Merge "Add strings and carrier config needed network service."
Treehugger Robot [Tue, 6 Feb 2018 20:47:51 +0000 (20:47 +0000)]
Merge "Add missing copyright messages"
Colin Cross [Tue, 6 Feb 2018 19:10:25 +0000 (11:10 -0800)]
Add missing copyright messages
Bug:
72993971
Test: m sdkparcelables
Change-Id: I9fa422160c29ce3054748b2b8d1e26541a697a90
Hall Liu [Tue, 6 Feb 2018 18:13:36 +0000 (18:13 +0000)]
Revert "Check for location access on TelephonyRegistry"
This reverts commit
8d584f0a91b0709b28ebc64abf0a6063429c8d58.
Reason for revert: b/
72967560
Change-Id: I9ca3c4a586e740a7b7d4cc5940ca8d4e4ebf3654
Paul Duffin [Tue, 6 Feb 2018 15:32:52 +0000 (15:32 +0000)]
Merge changes Ie05a1759,If3b6fc63
am:
1f14eab551
Change-Id: I259f07c37e2797f07b9bfdc13f5ebc0d05429877
Paul Duffin [Tue, 6 Feb 2018 15:25:51 +0000 (15:25 +0000)]
Merge "Correct inaccurate comments in build files"
am:
f55f221805
Change-Id: Iba1b710e00843d8c35c346d64d33250ce6654956
Treehugger Robot [Tue, 6 Feb 2018 15:02:06 +0000 (15:02 +0000)]
Merge changes Ie05a1759,If3b6fc63
* changes:
Modify android.test.runner to use new mock APIs
Add apis needed for android.test.legacy
Paul Duffin [Tue, 6 Feb 2018 13:39:46 +0000 (13:39 +0000)]
Merge "Correct inaccurate comments in build files"
Paul Duffin [Fri, 5 Jan 2018 13:52:17 +0000 (13:52 +0000)]
Modify android.test.runner to use new mock APIs
Previous change added some new public APIs to allow the
android.test.runner classes to be built against the public API stubs
rather than the internal classes. This change updates the
android.test.runner classes to use that new API.
This in turn is preparation for building an android.test.legacy library
that can be safely statically included in APKs.
Bug:
30188076
Test: make checkbuild
(cherry picked from commit
20af1df63f77f6b3ab12fd6221f581fe84182091)
Merged-In: I302626abb7e048ef0c3169e9a5209b85f2f87d34
Change-Id: Ie05a17598fcabc1189cacc912c01a25782ebd29c
Paul Duffin [Wed, 31 Jan 2018 13:30:22 +0000 (13:30 +0000)]
Correct inaccurate comments in build files
Bug:
30188076
Test: make checkbuild
Change-Id: I3881e66a949bfc5fbc34db0a104ef7a6995abe35
Paul Duffin [Fri, 22 Dec 2017 16:13:15 +0000 (16:13 +0000)]
Add apis needed for android.test.legacy
The long term goal of removing junit and dependent android.test classes
from the android.jar is the removal of the runtime libraries that
provide those classes. A key part of the strategy for migrating APKs off
the runtime libraries is the android.test.legacy library which APKs can
statically include in place of the runtime dependencies without having
to change their source code.
The longer term goal is for all tests to migrate from these classes
altogther and to use the Android Test Support Library instead but that
will require significant changes to the test source code.
In order for it to be safe to statically include android.test.legacy in
an APK it cannot use any internal APIs. This change adds the additional
classes and methods needed to the android.test.mock API library. The
additions are all marked as deprecated to try and avoid developers
from using them in new tests.
It also marks the AccountManager constructor used by MockAccountManager
with the android.annotation.MockApi so that it is included in the mock
stubs libraries against which the android.test.mock.stubs[-system]
libraries build.
Bug:
30188076
Test: make checkbuild
(cherry picked from commit
772b6923206a34e97c45bc48e7ad4bebfd3eae29)
Merged-In: I85417cc328cab898ab93b9b726648f4232555324
Change-Id: If3b6fc630df93a44e4c07ef769737a2ac3ebf476
Andreas Gampe [Tue, 6 Feb 2018 09:04:38 +0000 (09:04 +0000)]
Merge "Frameworks: Mark tests"
am:
c86b195cd5
Change-Id: I07af71812c623a14bd8df098e9991a331bdecbc2
Treehugger Robot [Tue, 6 Feb 2018 06:03:09 +0000 (06:03 +0000)]
Merge "Frameworks: Mark tests"
Stanley Tng [Tue, 6 Feb 2018 03:06:49 +0000 (03:06 +0000)]
Merge "Add function to change LE Tx Data Length"
am:
383a7d432f
Change-Id: I5e4e634b7265d3673a2142fc629d381d4b16b491
Stanley Tng [Tue, 6 Feb 2018 01:02:33 +0000 (01:02 +0000)]
Merge "Add function to change LE Tx Data Length"
Brad Ebinger [Mon, 5 Feb 2018 23:15:38 +0000 (23:15 +0000)]
Merge changes from topic "ims_apis"
am:
de65acb915
Change-Id: I717387907dde9f10fd61bbeb20e3533aeaeab220
Brad Ebinger [Mon, 5 Feb 2018 23:10:53 +0000 (23:10 +0000)]
Make ImsService API @SystemApi
am:
0e370b4a02
Change-Id: I7e0e8d26e842d78999138fe09e1fc9e5951a6506
Brad Ebinger [Mon, 5 Feb 2018 23:05:33 +0000 (23:05 +0000)]
Integrate new MMTel APIs into the framework
am:
5b1883b5f1
Change-Id: Id45f87f7399ddd8c2fd0046f5fa3f5364ec5f583
Brad Ebinger [Mon, 5 Feb 2018 22:59:45 +0000 (22:59 +0000)]
Integrate ImsCallSessionListener API changes
am:
6ed4ee6847
Change-Id: I41d63714efc2843fd7b1870fc99cefed074f91c3
Malcolm Chen [Tue, 30 Jan 2018 01:09:21 +0000 (17:09 -0800)]
Update ServiceState to adapt NetworkService change.
SST is re-routed to get cellular registration states from
CellularNetworkService. Updating ServiceState to adapt that
change.
Bug:
64132030
Test: unittest
Change-Id: Ifd557ce50a4419ead6125cda29c79d331508448e
Merged-In: Ifd557ce50a4419ead6125cda29c79d331508448e
Malcolm Chen [Mon, 29 Jan 2018 23:10:46 +0000 (15:10 -0800)]
Add strings and carrier config needed network service.
Add resource overlay and carrier config which will determine
which package / network services will be bound to.
Bug:
64132030
Test: regression tests
Change-Id: I5f515ec16b712e7be25f69e0e079d672227542b0
Merged-In: I5f515ec16b712e7be25f69e0e079d672227542b0
Tobias Thierer [Mon, 5 Feb 2018 15:49:52 +0000 (15:49 +0000)]
Pin jarjar targets to java_version 1.8.
This CL pins the following make targets to java_version 1.8,
which is currently the default:
framework-protos
repackaged.android.test.base
repackaged.android.test.mock
repackaged.android.test.runner
For consistency, their dependencies,
android.test.base
android.test.mock
android.test.runner
which contain .java source files, are also pinned to 1.8.
This is so that the two steps:
a) update jarjar to support v53 class files
b) support -target 1.9 in the rest of the toolchain
can be completed in any order, in future CLs. Before this CL,
they would have needed to be completed in order a), b).
Bug:
72703434
Test: EXPERIMENTAL_USE_OPENJDK9=true USE_R8=true make checkbuild docs
(in a client where CL http://r.android.com/596874 was reverted)
Change-Id: If78067294ae7ab78997aa109b0e08be427bdf0b8
Brad Ebinger [Mon, 5 Feb 2018 19:09:25 +0000 (19:09 +0000)]
Merge changes from topic "ims_apis"
* changes:
Modify ImsService API to accomodate compat
Make ImsService API @SystemApi
Integrate new MMTel APIs into the framework
Integrate ImsCallSessionListener API changes
goneil [Fri, 8 Dec 2017 00:31:10 +0000 (16:31 -0800)]
Make TelephonyManager#getNai() public
Bug:
67750905
Test: android.telephony.cts.TelephonyManagerTest#testTelephonyManager
Change-Id: I92af07a5ed2abd852ff0f79909c574d78b89f535
Hugo Benichi [Mon, 5 Feb 2018 00:30:14 +0000 (00:30 +0000)]
Merge "Update OWNER files for connectivity"
am:
771e229a23
Change-Id: I6daf999785a855ab2a7c97f113f5f8ec87a13256
Stanley Tng [Tue, 16 Jan 2018 18:39:32 +0000 (10:39 -0800)]
Add function to change LE Tx Data Length
As part of new SL4A tests for LE CoC to measure data throughput, this
commit adds a function to set the LE Tx Data Length parameter to its
maximum.
Test: Ran the new ACTS Tests for LE CoC (BleCocTest and BleCoc2ConnTest)
Bug:
70683224
Change-Id: Iea93f6cb9f4f7cc484f121afa158d7dae18d1ef1
Hugo Benichi [Sun, 4 Feb 2018 23:18:52 +0000 (23:18 +0000)]
Merge "Update OWNER files for connectivity"
Jack Yu [Sat, 3 Feb 2018 06:06:42 +0000 (06:06 +0000)]
Merge "Added data service configuration support"
am:
2e9bdd78f2
Change-Id: Idc7da08a22dd13f508d37df31966fb8346485ec4
Jack Yu [Sat, 3 Feb 2018 06:00:15 +0000 (06:00 +0000)]
Merge "Added permission for binding data service"
am:
0276f4290f
Change-Id: I22bf93b3233f8b1bf8edceaf64a6956a4517def6
Jack Yu [Sat, 3 Feb 2018 04:40:46 +0000 (04:40 +0000)]
Merge "Added data service configuration support"
Treehugger Robot [Sat, 3 Feb 2018 04:40:06 +0000 (04:40 +0000)]
Merge "Added permission for binding data service"
Stanley Tng [Sat, 3 Feb 2018 04:10:22 +0000 (04:10 +0000)]
Merge "Add function to update LE connection parameters"
am:
853628db72
Change-Id: I7a6a653fa9d007a71e5155180fc8e78289ad9b81
Stanley Tng [Sat, 3 Feb 2018 01:36:03 +0000 (01:36 +0000)]
Merge "Add function to update LE connection parameters"
weijuncheng [Sat, 3 Feb 2018 01:16:46 +0000 (01:16 +0000)]
Merge "Add DENSITY_440"
am:
6c40bbdc5e
Change-Id: Iffc972d66f36c11e3b465fdc3ab87a5518b7e646
Beverly [Sat, 3 Feb 2018 01:12:28 +0000 (01:12 +0000)]
Merge "DO NOT MERGE volume shows when status bar is null"
am:
b5993cfb8e -s ours
Change-Id: I6751be82e3055ab8510b283dec396f782918d9bc
Pavel Maltsev [Sat, 3 Feb 2018 00:07:59 +0000 (00:07 +0000)]
Merge "Enable multiple active Ethernet interfaces"
am:
0a6c539901
Change-Id: Idea050a552dd3447cccebab2fc6f041bae06853e
Treehugger Robot [Sat, 3 Feb 2018 00:03:57 +0000 (00:03 +0000)]
Merge "Add DENSITY_440"
Hall Liu [Sat, 3 Feb 2018 00:01:40 +0000 (00:01 +0000)]
Merge "Add missing return statement in setTempFileRootDirectory"
am:
d281b1a116
Change-Id: I9bbe241eec6aafdf41153cbc9c410b844ef63e2c
Pengquan Meng [Fri, 2 Feb 2018 23:56:42 +0000 (23:56 +0000)]
Merge "Use IntDef for BCD_EXTENDED_TYPE"
am:
97246476a7
Change-Id: I20ac464b285c1eb2572fc8a280ee2ff4b4c1b1c3
Treehugger Robot [Fri, 2 Feb 2018 23:50:00 +0000 (23:50 +0000)]
Merge "DO NOT MERGE volume shows when status bar is null"
Treehugger Robot [Fri, 2 Feb 2018 23:13:54 +0000 (23:13 +0000)]
Merge "Enable multiple active Ethernet interfaces"
Treehugger Robot [Fri, 2 Feb 2018 22:09:34 +0000 (22:09 +0000)]
Merge "Add missing return statement in setTempFileRootDirectory"
Ruchi Kandoi [Fri, 2 Feb 2018 22:01:34 +0000 (22:01 +0000)]
Merge "Add NFC Transaction Event intent actions and extras"
am:
337e2feada
Change-Id: I02cf168c0edff40dc6d85ad90a1f3ddc71044c91
Jack Yu [Thu, 1 Feb 2018 00:40:33 +0000 (16:40 -0800)]
Added permission for binding data service
This is to make sure only the system can bind the data service.
Test: Manual
Bug:
64132030
Merged-In: Iaf4e4a604396ec37c83516f1d1f163614ef23c3d
Change-Id: Iaf4e4a604396ec37c83516f1d1f163614ef23c3d
Pengquan Meng [Fri, 2 Feb 2018 21:32:11 +0000 (21:32 +0000)]
Merge "Use IntDef for BCD_EXTENDED_TYPE"
Ruchi Kandoi [Fri, 2 Feb 2018 20:34:23 +0000 (20:34 +0000)]
Merge "Add NFC Transaction Event intent actions and extras"
Hall Liu [Fri, 2 Feb 2018 20:24:08 +0000 (20:24 +0000)]
Merge "Rename MbmsDownloadSession#getDownloadStatus"
am:
a07d895f09
Change-Id: I1b6b063920de4de085f583d05876e246f1f65686
Hall Liu [Fri, 2 Feb 2018 20:01:12 +0000 (20:01 +0000)]
Merge "Rename MbmsDownloadSession#getDownloadStatus"