OSDN Git Service
Holly Jiuyu Sun [Wed, 31 Jan 2018 00:08:19 +0000 (00:08 +0000)]
Merge "Only allow LPA to select ISD-R using iccTransmitApduBasicChannel"
am:
04e5e63305
Change-Id: I90c12c640d8583edf97f3c44a03d5f4a63c0df20
Nathan Harold [Wed, 31 Jan 2018 00:04:27 +0000 (00:04 +0000)]
Merge "Update Docstring for SmsMessage.getOriginatingAddress"
am:
14513e0ea3
Change-Id: I46ee8b9534b695de8ad2263c4cc9a7d35165f1ad
Holly Jiuyu Sun [Tue, 30 Jan 2018 23:05:00 +0000 (23:05 +0000)]
Merge "Only allow LPA to select ISD-R using iccTransmitApduBasicChannel"
Alex Light [Tue, 30 Jan 2018 21:39:32 +0000 (21:39 +0000)]
Merge "Make AndroidRuntime only start the debugger for zygote forked apps."
am:
5cdf28f38b
Change-Id: I49026c8f5b79c2a872e206fe197b4ba4c7de255e
nharold [Tue, 30 Jan 2018 21:35:26 +0000 (21:35 +0000)]
Merge "Update hashCode in CellSignalStrength classes"
am:
59fec059a9
Change-Id: I1c00ea5351b86a4554b8276b01d9439e0a362d9a
Treehugger Robot [Tue, 30 Jan 2018 20:09:00 +0000 (20:09 +0000)]
Merge "Update Docstring for SmsMessage.getOriginatingAddress"
Alex Light [Tue, 30 Jan 2018 19:55:28 +0000 (19:55 +0000)]
Merge "Make AndroidRuntime only start the debugger for zygote forked apps."
nharold [Tue, 30 Jan 2018 19:52:36 +0000 (19:52 +0000)]
Merge "Update hashCode in CellSignalStrength classes"
Mikael Magnusson [Tue, 30 Jan 2018 19:52:21 +0000 (19:52 +0000)]
Merge "Prevent ArrayIndexOutOfBoundsException for some invalid sysui_nav_bar values"
am:
af5b90ff45
Change-Id: Ie80bb69b0208dab1e00da76cb60275151a6a5bc7
nharold [Tue, 30 Jan 2018 19:41:53 +0000 (19:41 +0000)]
Merge changes from topic "cherry-pick-cell-keepalive"
am:
8cabb012fa
Change-Id: I3001cd2693b2c57643672fd7f370b5cca2890585
Tyler Gunn [Tue, 30 Jan 2018 19:32:32 +0000 (19:32 +0000)]
Merge "Add handover permission, fill in some missing API gaps."
am:
1dfa830bb0
Change-Id: Ie07c7031c1411b59bbcd250be9517eda51b58310
Treehugger Robot [Tue, 30 Jan 2018 19:11:36 +0000 (19:11 +0000)]
Merge "Prevent ArrayIndexOutOfBoundsException for some invalid sysui_nav_bar values"
nharold [Tue, 30 Jan 2018 18:39:07 +0000 (18:39 +0000)]
Merge changes from topic "cherry-pick-cell-keepalive"
* changes:
Rework KeepalivePacketData for Compatibility with Cell
Add Constants for NATT Keepalive to RILConstants
Relocate KeepalivePacketData to frameworks/base
Primiano Tucci [Tue, 30 Jan 2018 18:38:41 +0000 (18:38 +0000)]
Merge "DropboxManager: Add err message if passing an invalid fd to addFile()"
am:
90529d212a
Change-Id: I81362fcea24b7bf160854c972500f3e63b032330
Treehugger Robot [Tue, 30 Jan 2018 18:33:27 +0000 (18:33 +0000)]
Merge "Add handover permission, fill in some missing API gaps."
Treehugger Robot [Tue, 30 Jan 2018 16:16:34 +0000 (16:16 +0000)]
Merge "DropboxManager: Add err message if passing an invalid fd to addFile()"
Paul Duffin [Tue, 30 Jan 2018 15:59:40 +0000 (15:59 +0000)]
Merge changes Ied54c246,I0ea83bc8,Ibd8cb61d
am:
88d9ddd386
Change-Id: I1fd42187c55b80e60f2eac0af278bdecf806fccf
Paul Duffin [Tue, 30 Jan 2018 15:38:36 +0000 (15:38 +0000)]
Merge changes I59bd6ec5,I48864d48,I9b46a4e2,I09a70f3e
am:
ba81a4d2a9
Change-Id: I8656226d30cb88df36c911b3da73674ee3d87130
Treehugger Robot [Tue, 30 Jan 2018 14:54:25 +0000 (14:54 +0000)]
Merge changes Ied54c246,I0ea83bc8,Ibd8cb61d
* changes:
Create test-legacy/ for android.test.legacy target
Add android.test.legacy.jar to SDK build
Add android.test.legacy target
Treehugger Robot [Tue, 30 Jan 2018 14:22:00 +0000 (14:22 +0000)]
Merge changes I59bd6ec5,I48864d48,I9b46a4e2,I09a70f3e
* changes:
Build test-runner/tests
Use prebuilt android.test. stubs jars for app builds
Build stubs against SDK and clear local variables
Use prebuilt android.test.base.jar for app builds
Paul Duffin [Tue, 30 Jan 2018 13:01:30 +0000 (13:01 +0000)]
Create test-legacy/ for android.test.legacy target
The android.test.legacy (and legacy-android-test) target depends on
code from both test-base/ and test-runner/ and do not really belong
in either folder.
Having a separate folder will also provide a convenient place for
the artifacts needed to publish android.test.legacy to
maven.google.com.
Bug:
30188076
Test: make checkbuild
Change-Id: Ied54c24694b3167fcf9075a3157e92ec53b8f636
Paul Duffin [Mon, 11 Dec 2017 15:13:08 +0000 (15:13 +0000)]
Build test-runner/tests
Previous change
e254526f0fe5d22681555bd4a00b7ee96fee1dc1 inadvertently
removed the line to include the tests/Android.mk file.
(cherry picked from commit
006b7a2b760b89211b9530804118a8333cee314b)
Bug:
30188076
Test: make checkbuild
Change-Id: I59bd6ec5d317eb6306642974902e4c061e594aa8
Merged-In: Ia0ba14a70d2232d464420265a7a5f9c4dde3661b
Paul Duffin [Fri, 26 Jan 2018 15:10:36 +0000 (15:10 +0000)]
Add android.test.legacy.jar to SDK build
This is needed in order to create a prebuilts version of this JAR that
can be used for unbundled builds.
Bug:
30188076
Test: wait for pi-release build and check
(cherry picked from commit
af06ed42b5316a12b0c37d4296cc86cb112d0021)
Change-Id: I0ea83bc88b6107f4154a9ca02f13b7c8cb367fea
Paul Duffin [Tue, 7 Nov 2017 07:33:11 +0000 (07:33 +0000)]
Use prebuilt android.test. stubs jars for app builds
(cherry picked from commit
e144602d9c94d46b2da11d70f526d747b5e05750)
Bug:
30188076
Test: tapas Launcher3
Change-Id: I48864d48098cfa02e15a6eaf8e4d6b53afc5b56c
Merged-In: If632c39c9d98d89d597d410ebc7973903c9fa91e
Paul Duffin [Fri, 5 Jan 2018 15:11:18 +0000 (15:11 +0000)]
Add android.test.legacy target
Adds a library that builds against the public API and so can be safely
statically included into applications to avoid them having to depend
on the android.test.base and android.test.runner runtime libraries.
(cherry picked from commit
a70f66cb5e40105d4b0ec535f011eea83a38c86a)
Bug:
30188076
Test: make checkbuild
Change-Id: Ibd8cb61d00a65dbcf630672706323e42d82e6ba2
Merged-In: Iae7e3c64392e11035322092ed8e194740ba2d321
Paul Duffin [Fri, 30 Jun 2017 15:02:09 +0000 (16:02 +0100)]
Build stubs against SDK and clear local variables
The stubs need to be built against the current SDK where possible and
not the internal modules.
(cherry picked from commit
d41d847c83c598082a6572f38d0d40f5dee427ef)
Bug:
30188076
Test: delete stub files and remake targets
Change-Id: I9b46a4e2be341fed7e5b33bbf1a80d88c5486ae6
Merged-In: Id724c16e56d1e8fe7f61cfafe7f11ea27e01e659
Paul Duffin [Wed, 6 Dec 2017 12:43:28 +0000 (12:43 +0000)]
Use prebuilt android.test.base.jar for app builds
(cherry picked from commit
1f090a8d66126a936e40f0e872c5fe5b655fa335)
Bug:
30188076
Test: make checkbuild
Change-Id: I09a70f3e79d0935394332870613b96c653af5e85
Merged-In: I1d7e705baf5728e7a034f3bd32746de3a1d3cd78
Bowgo Tsai [Tue, 30 Jan 2018 10:25:39 +0000 (10:25 +0000)]
Merge "Add odm sepolicy support to SELinuxMMAC.java"
am:
4db2d4690e
Change-Id: I7b631518df8812e7599bfffa197e814d5df66717
Treehugger Robot [Tue, 30 Jan 2018 08:11:53 +0000 (08:11 +0000)]
Merge "Add odm sepolicy support to SELinuxMMAC.java"
Dan Willemsen [Tue, 30 Jan 2018 04:11:18 +0000 (04:11 +0000)]
Merge "Remove undefined all-aidl-files-under"
am:
ab5ac7814b
Change-Id: I97c3229c1d82494219ec17a23c1f094a3a27e5ae
Treehugger Robot [Tue, 30 Jan 2018 03:22:21 +0000 (03:22 +0000)]
Merge "Remove undefined all-aidl-files-under"
Nathan Harold [Mon, 29 Jan 2018 19:36:03 +0000 (11:36 -0800)]
Update Docstring for SmsMessage.getOriginatingAddress
There was a public request for clarification on the address
format for getOriginatingAddress. I did a little research and
have added the answer to the docstring.
Bug:
64697463
Test: compilation
Merged-In: Icf37af0a5940a6fb7798d7c7cafe7b97683bb689
Change-Id: Icf37af0a5940a6fb7798d7c7cafe7b97683bb689
Nathan Harold [Tue, 30 Jan 2018 01:17:10 +0000 (17:17 -0800)]
Update hashCode in CellSignalStrength classes
The CellSignalStrength hashCode function was using a
fairly ineffective method of hashing. An External
reporter requested that we fix it. This CL moves to
using the Objects.hash() implementation.
Bug:
22479413
Test: compilation
Change-Id: Ic017ba54ef757fd3ec3e5000ac61108dd836bd8a
Hugo Benichi [Tue, 30 Jan 2018 01:41:23 +0000 (01:41 +0000)]
Merge changes I303d1102,I72c9aa43,If13a5284
am:
cf5841db8d
Change-Id: I402de7fe5fc0e9bf56dc42f4c956c511baee78ab
Dan Willemsen [Tue, 30 Jan 2018 00:39:27 +0000 (16:39 -0800)]
Remove undefined all-aidl-files-under
This is not a defined function, and there are no aidl files under these
directories anyways.
Bug:
72661763
Test: find location/lib -name '*.aidl'
Test: find media/lib -name '*.aidl'
Change-Id: I000d8febd54a50d4c07b910fa374ac8019f696be
Hugo Benichi [Tue, 30 Jan 2018 00:26:31 +0000 (00:26 +0000)]
Merge changes I303d1102,I72c9aa43,If13a5284
* changes:
Fix default network validation overcounting
Prevent crash in NetworkManagementServiceTest#shutdown()
Fix ApfTest
Holly Jiuyu Sun [Tue, 30 Jan 2018 00:20:46 +0000 (00:20 +0000)]
Merge "Remove SystemApi annotation from EuiccManager.getOtaStatus()"
am:
67fb5370cd
Change-Id: I784ea684fa99ef0dc6ed56ddff966669fbaddd49
Alex Light [Mon, 29 Jan 2018 22:27:38 +0000 (14:27 -0800)]
Make AndroidRuntime only start the debugger for zygote forked apps.
This got changed unintentionally in commit
fffb273. Restore the
original behavior where JDWP will not be enabled for non-zygote apps.
Bug:
72400560
Test: atest CtsJdwpSecurityHostTestCases
Change-Id: I364a9d8b6e87efc1604741a7e5dd68221ed8e491
Holly Jiuyu Sun [Mon, 29 Jan 2018 23:47:11 +0000 (23:47 +0000)]
Merge "Remove SystemApi annotation from EuiccManager.getOtaStatus()"
Jiyong Park [Mon, 8 Jan 2018 05:08:17 +0000 (14:08 +0900)]
Remove SystemApi annotation from EuiccManager.getOtaStatus()
EuiccManager.getOtaStatus() has been annotated as @SystemApi, but its
declaring class EuiccManager has not. Therefore, the method hasn't been
recognized as SystemApi (does not appear in system-current.txt) and no
app is using the method.
This hasn't been harmful, but will soon trigger CTS failures when we do
the exact match for SystemAPIs; a runtime entity annotated as @SystemApi
have to exist in the documented API (e.g. system-current.txt). So
removing this no-op annotation.
Bug:
67891551
Test: m -j checkapi
Change-Id: I570ef5e5c88b6b9162116d3d3a7b17367efa9d7f
Nathan Harold [Thu, 7 Dec 2017 03:07:32 +0000 (19:07 -0800)]
Rework KeepalivePacketData for Compatibility with Cell
KeepalivePacketData currently mixes multiple concepts: the
list of parameters that are used to generate a keepalive
packet, the keepalive packet itself, and the parameters that
are needed to send a keepalive packet over an ethernet link.
The KeepalivePacketData is now a parcelable that can be used
generically by any NetworkAgent, regardless of how that Agent
fulfills its duty to initiate and maintain a keepalive session.
Bug:
69063212
Test: verified with SL4A, additional tests pending
Merged-In: I23dc4827ae729583356a8ff0f02e39a2ad2b81f5
Change-Id: I23dc4827ae729583356a8ff0f02e39a2ad2b81f5
(cherry picked from commit
26deacfbe7eb1730aea9eeb03fa265af2ce90cad)
Nathan Harold [Tue, 11 Jul 2017 23:25:16 +0000 (16:25 -0700)]
Add Constants for NATT Keepalive to RILConstants
Bug:
38350389
Test: compilation
Merged-In: Ic18a7c947d2c62efe76d656bd683f9ce296f68fd
Change-Id: Ic18a7c947d2c62efe76d656bd683f9ce296f68fd
(cherry picked from commit
974aada04734ced17f3842c817e7e8c3528d0739)
Nathan Harold [Fri, 3 Nov 2017 04:01:46 +0000 (21:01 -0700)]
Relocate KeepalivePacketData to frameworks/base
Due to an issue resolving the boot classpath, the
KeepalivePacketData structure cannot be referenced
by frameworks/opt/telephony while it is in services.
-Move KeepalivePacketData to android.net
-Also, relocate IpUtils without changing the package
name.
Bug:
38350389
Test: compilation
Merged-In: If5fc63e9ad8b9b2d4c2fee47ff4bab2ab190a05a
Change-Id: If5fc63e9ad8b9b2d4c2fee47ff4bab2ab190a05a
(cherry picked from commit
41002e3080461ba6a7aee12c1d12dd13edc8626c)
Ruchi Kandoi [Mon, 29 Jan 2018 18:18:11 +0000 (18:18 +0000)]
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT"
am:
ac2247c406
Change-Id: I6592686f765e3474d1c02bf9b3bc243ab152b641
Treehugger Robot [Mon, 29 Jan 2018 17:59:23 +0000 (17:59 +0000)]
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT"
Mikael Magnusson [Mon, 29 Jan 2018 16:56:10 +0000 (17:56 +0100)]
Prevent ArrayIndexOutOfBoundsException for some invalid sysui_nav_bar values
A user can change sysui_nav_bar via adb.
If value of sysui_nav_bar doesn't contain two semicolons, split String array
is accessed out of bounds throwing an exception, sending SystemUI
in an exception loop.
Test: manual
Test: adb exec-out settings put secure sysui_nav_bar "home;back"
Change-Id: Ia9d74be36d287085650393476029489c9a359a0f
Jason Monk [Mon, 29 Jan 2018 15:56:06 +0000 (15:56 +0000)]
Merge "Fix nav keys being tiny on sw600dp devices"
am:
a20239bf71
Change-Id: I30fbb071d290ff8477560f25216dd1ea04c789a6
David Brazdil [Mon, 29 Jan 2018 15:52:46 +0000 (15:52 +0000)]
Merge "Control hidden API toast with a system property"
am:
13020490be
Change-Id: Ib390fd568e4a5d71cdceec3a84b0d55e02b9c45d
Treehugger Robot [Mon, 29 Jan 2018 14:55:21 +0000 (14:55 +0000)]
Merge "Fix nav keys being tiny on sw600dp devices"
David Brazdil [Mon, 29 Jan 2018 14:46:06 +0000 (14:46 +0000)]
Merge "Control hidden API toast with a system property"
David Brazdil [Fri, 26 Jan 2018 12:23:15 +0000 (12:23 +0000)]
Control hidden API toast with a system property
CL Id0a4200f912ac3303026cb26b6d8974c47332828 sets a system property
"ro.art.hiddenapi.warning" for non-release, non-user builds. This
patch reads that flag and unless the flag is set, will only ever show
the warning message if the app is debuggable.
Test: manual
Bug:
64382372
Change-Id: I9b552792779589a7a91818a82d5c86141fc0a30b
Hugo Benichi [Thu, 14 Dec 2017 00:56:04 +0000 (09:56 +0900)]
Fix default network validation overcounting
When switching from a validated default network to a new validated
default network (typically because of a better score),
DefaultNetworkMetrics would not reset the last validation timestamp.
This would cause the new default network to have a total recorded
validation time overcounted by the validation time of the previous
default network.
The following fix should be applied downstream for consumers of
previously recorded data:
validation_time = min validation_time, duration_time);
Test: runtest -x frameworks/base/tests/net/../IpConnectivityMetricsTest
Change-Id: I303d11023527c19435f5f5e796a0295ae3f76d9f
Hugo Benichi [Mon, 29 Jan 2018 05:00:44 +0000 (14:00 +0900)]
Prevent crash in NetworkManagementServiceTest#shutdown()
The shutdown method in NetworkManagementServiceTest was trying to close
the local socket on the test side, causing the NativeDaemonConnector
internal to NetworkManagementService to sometime crash due to the
output stream on NetworkManagementService side to throw on pending
reads.
The correct fix would be to shutdown the NativeDaemonConnector
inside NetworkManagementService and implement NetworkManagementService's
shutdown method, however there is no way to cleanly close a
NativeDaemonConnector.
Instead, this patch doesn't do any cleanup of the listening socket, the
test local socket, and its output stream. These objects' resources get
eventually collected by the system when the test process exits.
Test: runtest frameworks-net
Change-Id: I72c9aa43403754b55e9d23bf4f3ba8b7b4a3e10a
Hugo Benichi [Mon, 29 Jan 2018 04:16:12 +0000 (13:16 +0900)]
Fix ApfTest
By adding missing so file to Android.mk.
Test: runtest -x frameworks/base/tests/net/java/android/net/apf/ApfTest.java
Change-Id: If13a52845e0cc70a27ca6eeb976a14f91c7146ea
Erik Kline [Sat, 27 Jan 2018 07:35:21 +0000 (07:35 +0000)]
Merge "Add Tethering's UID to the legacy type NetworkCapabilities"
am:
2aed62d664
Change-Id: I3d93baafab1bc9be4bee6246cc3e04682363a690
Treehugger Robot [Sat, 27 Jan 2018 07:20:10 +0000 (07:20 +0000)]
Merge "Add Tethering's UID to the legacy type NetworkCapabilities"
Jack Yu [Sat, 27 Jan 2018 03:35:50 +0000 (03:35 +0000)]
Merge "Added nullable callback support"
am:
35520445be
Change-Id: Ic34fd279a8a125e4ab7fe634dbb38479860932c2
Treehugger Robot [Sat, 27 Jan 2018 03:24:52 +0000 (03:24 +0000)]
Merge "Added nullable callback support"
Ruchi Kandoi [Sat, 27 Jan 2018 01:52:33 +0000 (01:52 +0000)]
Merge "Add UID and Service for Secure Element Application"
am:
b8b7589531
Change-Id: Ib66be1532dd440b1161e6d2d727243fc6b9e614f
Ruchi Kandoi [Wed, 3 Jan 2018 20:20:46 +0000 (12:20 -0800)]
Add android.Manifest.permission.NFC_TRANSACTION_EVENT
This permission would gate if an application is eligible to receive
notifications about nfc transactions taking place on the Secure
Elements.
Bug:
72556384
Test: Test dummy notifications on sample app.
Change-Id: I233f7185bbc3a5511f79ae012cc60a081968eb99
Jack Yu [Sat, 27 Jan 2018 00:03:17 +0000 (16:03 -0800)]
Added nullable callback support
Sometimes data service clients do not care the result of the
requests so they pass null callback. In this case the data service
should handle it.
Test: Manual
Bug:
64132030
Change-Id: Ib188994fed4e708de875a24d5386a74a8f6db4dd
Holly Jiuyu Sun [Fri, 26 Jan 2018 23:49:38 +0000 (15:49 -0800)]
Only allow LPA to select ISD-R using iccTransmitApduBasicChannel
Bug:
72561613
Test: test on phone
Change-Id: Ifae8c341dd41936a993c6202bc0c7d1c71b8d360
Treehugger Robot [Sat, 27 Jan 2018 00:53:00 +0000 (00:53 +0000)]
Merge "Add UID and Service for Secure Element Application"
Jack Yu [Sat, 27 Jan 2018 00:52:06 +0000 (00:52 +0000)]
Merge "Renamed Result to ResultCode"
am:
093ab1dc61
Change-Id: I1dda97b48a3f5068fc001478b88190406f03d109
Treehugger Robot [Sat, 27 Jan 2018 00:39:37 +0000 (00:39 +0000)]
Merge "Renamed Result to ResultCode"
hirotaka motegi [Fri, 26 Jan 2018 23:57:58 +0000 (23:57 +0000)]
Merge "Support Background Service Limitations."
am:
a0f863d4fb
Change-Id: I9adaa11f83492d5e09d19ded088deb7119bcdade
Pavlin Radoslavov [Fri, 26 Jan 2018 23:53:17 +0000 (23:53 +0000)]
Merge "Add support for Multi-A2DP state machines per device"
am:
bb5318df8a
Change-Id: I9fabffc6d7fdb3cb001b685618532f10000dd4ac
Treehugger Robot [Fri, 26 Jan 2018 23:36:21 +0000 (23:36 +0000)]
Merge "Support Background Service Limitations."
Pavlin Radoslavov [Fri, 26 Jan 2018 22:53:02 +0000 (22:53 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"
am:
3151e86aa8
Change-Id: I1f1e62dde014fe4b0a2d3e93aeea0f305232bc01
Treehugger Robot [Fri, 26 Jan 2018 22:43:53 +0000 (22:43 +0000)]
Merge "Add support for Multi-A2DP state machines per device"
Jack Yu [Fri, 26 Jan 2018 21:59:33 +0000 (21:59 +0000)]
Merge "Added slot id in the internal API"
am:
045ff781b9
Change-Id: I4222766dbd47c731b1612f9d4405375a7b4dd499
Pavlin Radoslavov [Thu, 4 Jan 2018 03:38:39 +0000 (19:38 -0800)]
Add support for Multi-A2DP state machines per device
* Update usage of A2dpService API calls that take BluetoothDevice
as an additional argument
* Update the description for BluetoothA2dp.connect()
Exempt-From-Owner-Approval: De-facto owner of the relevant changes is
the Bluetooth team.
Bug:
69269748
Test: Manual
Change-Id: I190ed48ef65bbc8b88b45f84ebd6ab3d21cf0b4e
Merged-In: I190ed48ef65bbc8b88b45f84ebd6ab3d21cf0b4e
(cherry picked from commit
502af2192c6d291174efa434a70101f302a5bd97)
Treehugger Robot [Fri, 26 Jan 2018 20:46:45 +0000 (20:46 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"
Jack Yu [Fri, 26 Jan 2018 19:25:13 +0000 (19:25 +0000)]
Merge "Added slot id in the internal API"
David Brazdil [Fri, 26 Jan 2018 19:24:35 +0000 (19:24 +0000)]
Merge "Copy hidden API blacklist/dark greylist into build folder"
am:
656096516c
Change-Id: Icfda85f4f80516d6f4141be7ede7d047df6aeecf
Primiano Tucci [Fri, 26 Jan 2018 19:18:24 +0000 (19:18 +0000)]
Merge "DropBoxManager: Allow adding a file using an fd"
am:
a946cc9f53
Change-Id: Ie7a7071264cb91d26eb380b3155a5ed71667fb46
Pavlin Radoslavov [Sun, 21 Jan 2018 10:59:15 +0000 (02:59 -0800)]
Add Settings support for Bluetooth Multi-A2DP and Multi-HFP
When there are multiple connected A2DP/HFP devices, if a connected
device's name is clicked on, that device will be chosen as
Active - i.e., it will be the device chosen for audio out / phone call.
Also:
* Listen to the BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED
and BluetoothHeadset.ACTION_ACTIVE_DEVICE_CHANGED intents
and update the the status of the current active device.
* When connecting a new device, and Multi-A2DP is enabled, don't
disconnect the currently connected device.
* Update the implementation of isA2dpPlaying() so it correctly checks
all connected devices, not only the first one.
Test: Manual: multiple connected A2DP devices, and selecting each as
the Active Device.
Bug:
64767509
Change-Id: I69f3c85ebf5a7f07f6deed484c6dd65705460ae4
Merged-In: I69f3c85ebf5a7f07f6deed484c6dd65705460ae4
(cherry picked from commit
1af33a192614bb490701ab2e8e21866690b3b4fa)
Ruchi Kandoi [Thu, 4 Jan 2018 00:14:57 +0000 (16:14 -0800)]
Add UID and Service for Secure Element Application
Bug:
64994044
Test: Boot; Check Service loaded.
Merged-In: I2f48ff204acd29b1a9f6819910aba5f8f3762977
Change-Id: I2f48ff204acd29b1a9f6819910aba5f8f3762977
(cherry picked from commit
dfaf4bdd1e7e12caf9bb69c8facc38e879861baf)
Primiano Tucci [Fri, 26 Jan 2018 17:28:58 +0000 (17:28 +0000)]
DropboxManager: Add err message if passing an invalid fd to addFile()
Follow up to I076bfd3180fb9b4baff7e1bae2e611419061b2a7. Adds an
error message if passing -1 to addFile(int fd)
Change-Id: I73a8d88f12b14bc28ea3bc3782a9df7d96d53c92
Test: builds
Jack Yu [Fri, 26 Jan 2018 17:21:16 +0000 (09:21 -0800)]
Renamed Result to ResultCode
Test: Manual
Bug:
64132030
Change-Id: Idd49322186d1a60c9846cc205964f3b2e318c31a
David Brazdil [Fri, 26 Jan 2018 16:03:25 +0000 (16:03 +0000)]
Merge "Copy hidden API blacklist/dark greylist into build folder"
Treehugger Robot [Fri, 26 Jan 2018 15:51:57 +0000 (15:51 +0000)]
Merge "DropBoxManager: Allow adding a file using an fd"
Primiano Tucci [Fri, 26 Jan 2018 14:25:18 +0000 (14:25 +0000)]
DropBoxManager: Allow adding a file using an fd
This patch adds an overload to DropBoxManager::addFile() which accepts
an already-opened file as a file descriptor. This avoids the need for
clients to create a filesystem-visible file when uploading data to
DropBox.
Test: Tested with perfetto using https://android-review.googlesource.com/c/platform/external/perfetto/+/587674
Change-Id: I076bfd3180fb9b4baff7e1bae2e611419061b2a7
Merged-In: I076bfd3180fb9b4baff7e1bae2e611419061b2a7
Tobias Thierer [Fri, 26 Jan 2018 14:18:44 +0000 (14:18 +0000)]
Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API."
am:
9f82b6bab5
Change-Id: I8cc8b609a02e5059bcda111a416d47d7272c4e3b
David Srbecky [Fri, 26 Jan 2018 13:59:35 +0000 (13:59 +0000)]
Merge "Add dalvik.vm.minidebuginfo property for ART"
am:
418a96457c
Change-Id: Ife46a3f6e1c5ad33e7830df0c74a6cbd674f8032
Tobias Thierer [Fri, 26 Jan 2018 13:05:06 +0000 (13:05 +0000)]
Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API."
David Srbecky [Fri, 26 Jan 2018 12:37:48 +0000 (12:37 +0000)]
Merge "Add dalvik.vm.minidebuginfo property for ART"
David Brazdil [Fri, 26 Jan 2018 11:13:35 +0000 (11:13 +0000)]
Copy hidden API blacklist/dark greylist into build folder
This change is meant for ART buildbots which build against a pinned
commit of the framework and thus do not have the commit which
introduced hidden API lists. Normal builds will now copy the blacklist
and dark greylist into the build folder first, and then generate the
light greylist as usual. If a buildbot does not have the framework
changes, it can create dummy API lists in the build folder before
starting the build and avoid the issue.
Test: make
Bug:
64382372
Change-Id: Ib6e53a45bcc917abb4ba67fdcbf01d4a19c2d56f
Erik Kline [Fri, 26 Jan 2018 10:23:14 +0000 (19:23 +0900)]
Add Tethering's UID to the legacy type NetworkCapabilities
This is needed because satisfiedByNC() compares UIDs by default now, and
the NCs we receive in callbacks have Tethering's UID patched in.
Bug:
72498421
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes, module library loading failures:
Caused by: java.lang.UnsatisfiedLinkError: dlopen failed: library "libdexfile.so" not found
- manually starting tethering works fine
Change-Id: I31f6516e2c1539809f8d052333fd2a616158cb92
Andreas Gampe [Fri, 26 Jan 2018 05:57:39 +0000 (05:57 +0000)]
Merge "Watchdog: Add statsd to interesting processes"
am:
8e8c9664ae
Change-Id: I2dc9515e9205ced55bcddc2b0d83ac0105bc48f4
Treehugger Robot [Fri, 26 Jan 2018 03:52:14 +0000 (03:52 +0000)]
Merge "Watchdog: Add statsd to interesting processes"
Xiangyu/Malcolm Chen [Fri, 26 Jan 2018 03:29:53 +0000 (03:29 +0000)]
Merge "Add Voice / Data network specific reg states."
am:
ffdbbc533c
Change-Id: I28d44f657a60ec0f823524c3b5107bc3f4808bb1
Tobias Thierer [Fri, 26 Jan 2018 02:03:33 +0000 (02:03 +0000)]
Merge "Deprecate android.util.Mutable*."
am:
71a9e66d4a
Change-Id: Ib82f53cac275d084851251c44b6860bfb282373d
Ruchi Kandoi [Fri, 26 Jan 2018 01:13:45 +0000 (01:13 +0000)]
Merge "Open Mobile API for frameworks/base"
am:
183865f3e1
Change-Id: I96804d1c8e75a6d9d1475438a1753f54e07d0b8a
Xiangyu/Malcolm Chen [Fri, 26 Jan 2018 00:41:27 +0000 (00:41 +0000)]
Merge "Add Voice / Data network specific reg states."
Treehugger Robot [Fri, 26 Jan 2018 00:28:52 +0000 (00:28 +0000)]
Merge "Deprecate android.util.Mutable*."
Tyler Gunn [Mon, 22 Jan 2018 23:17:54 +0000 (15:17 -0800)]
Add handover permission, fill in some missing API gaps.
Adding the ACCEPT_HANDOVER runtime permission which an app must have in
order to accept handovers (this is per design).
Adding missing onHandoverComplete method in the android.telecom.Connection
API (per design).
Finishing plumbing for android.telecom.Call#onHandoverComplete API.
Fix issue where the new handover API methods would never get called; the
legacy handover extra was being used in this case when it should not have
been.
Bug:
65415068
Test: Verified using new CTS tests
Change-Id: If1558f6a23911862c02ac5b18fb62d86911ed7e2
Merged-In: If1558f6a23911862c02ac5b18fb62d86911ed7e2
Ruchi Kandoi [Thu, 25 Jan 2018 23:30:50 +0000 (23:30 +0000)]
Merge "Open Mobile API for frameworks/base"
David Brazdil [Thu, 25 Jan 2018 22:01:49 +0000 (22:01 +0000)]
Merge "Show a warning toast/dialog when an app uses hidden APIs"
am:
fbef950d95
Change-Id: Icab7166bf83d2920c8d3f22774eafa4aea9fdaa4
Hugo Benichi [Thu, 25 Jan 2018 21:55:08 +0000 (21:55 +0000)]
Merge "Tcp socket metrics: implement INetdEventListener callback"
am:
93b1787a3d
Change-Id: Ife421f2612b0bfc2d6be5c6d174d24abd4d2e2fb