OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge changes I59bd6ec5,I48864d48,I9b46a4e2,I09a70f3e
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

6 years agoBuild test-runner/tests
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

6 years agoUse prebuilt android.test. stubs jars for app builds
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

6 years agoBuild stubs against SDK and clear local variables
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

6 years agoUse prebuilt android.test.base.jar for app builds
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

6 years agoMerge "Add odm sepolicy support to SELinuxMMAC.java"
Treehugger Robot [Tue, 30 Jan 2018 08:11:53 +0000 (08:11 +0000)]
Merge "Add odm sepolicy support to SELinuxMMAC.java"

6 years agoMerge "Remove undefined all-aidl-files-under"
Treehugger Robot [Tue, 30 Jan 2018 03:22:21 +0000 (03:22 +0000)]
Merge "Remove undefined all-aidl-files-under"

6 years agoRemove undefined all-aidl-files-under
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

6 years agoMerge changes I303d1102,I72c9aa43,If13a5284
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

6 years agoMerge "Remove SystemApi annotation from EuiccManager.getOtaStatus()"
Holly Jiuyu Sun [Mon, 29 Jan 2018 23:47:11 +0000 (23:47 +0000)]
Merge "Remove SystemApi annotation from EuiccManager.getOtaStatus()"

6 years agoRemove 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

6 years agoMerge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT"
Treehugger Robot [Mon, 29 Jan 2018 17:59:23 +0000 (17:59 +0000)]
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT"

6 years agoMerge "Fix nav keys being tiny on sw600dp devices"
Treehugger Robot [Mon, 29 Jan 2018 14:55:21 +0000 (14:55 +0000)]
Merge "Fix nav keys being tiny on sw600dp devices"

6 years agoMerge "Control hidden API toast with a system property"
David Brazdil [Mon, 29 Jan 2018 14:46:06 +0000 (14:46 +0000)]
Merge "Control hidden API toast with a system property"

6 years agoControl 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

6 years agoFix default network validation overcounting
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

6 years agoPrevent crash in NetworkManagementServiceTest#shutdown()
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

6 years agoFix ApfTest
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

6 years agoMerge "Add Tethering's UID to the legacy type NetworkCapabilities"
Treehugger Robot [Sat, 27 Jan 2018 07:20:10 +0000 (07:20 +0000)]
Merge "Add Tethering's UID to the legacy type NetworkCapabilities"

6 years agoMerge "Added nullable callback support"
Treehugger Robot [Sat, 27 Jan 2018 03:24:52 +0000 (03:24 +0000)]
Merge "Added nullable callback support"

6 years agoAdd android.Manifest.permission.NFC_TRANSACTION_EVENT
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

6 years agoAdded nullable callback support
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

6 years agoMerge "Add UID and Service for Secure Element Application"
Treehugger Robot [Sat, 27 Jan 2018 00:53:00 +0000 (00:53 +0000)]
Merge "Add UID and Service for Secure Element Application"

6 years agoMerge "Renamed Result to ResultCode"
Treehugger Robot [Sat, 27 Jan 2018 00:39:37 +0000 (00:39 +0000)]
Merge "Renamed Result to ResultCode"

6 years agoMerge "Support Background Service Limitations."
Treehugger Robot [Fri, 26 Jan 2018 23:36:21 +0000 (23:36 +0000)]
Merge "Support Background Service Limitations."

6 years agoMerge "Add support for Multi-A2DP state machines per device"
Treehugger Robot [Fri, 26 Jan 2018 22:43:53 +0000 (22:43 +0000)]
Merge "Add support for Multi-A2DP state machines per device"

6 years agoAdd support for Multi-A2DP state machines per device
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)

6 years agoMerge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"
Treehugger Robot [Fri, 26 Jan 2018 20:46:45 +0000 (20:46 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"

6 years agoMerge "Added slot id in the internal API"
Jack Yu [Fri, 26 Jan 2018 19:25:13 +0000 (19:25 +0000)]
Merge "Added slot id in the internal API"

6 years agoAdd Settings support for Bluetooth Multi-A2DP and Multi-HFP
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)

6 years agoAdd UID and Service for Secure Element Application
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)

6 years agoRenamed Result to ResultCode
Jack Yu [Fri, 26 Jan 2018 17:21:16 +0000 (09:21 -0800)]
Renamed Result to ResultCode

Test: Manual
Bug: 64132030
Change-Id: Idd49322186d1a60c9846cc205964f3b2e318c31a

6 years agoMerge "Copy hidden API blacklist/dark greylist into build folder"
David Brazdil [Fri, 26 Jan 2018 16:03:25 +0000 (16:03 +0000)]
Merge "Copy hidden API blacklist/dark greylist into build folder"

6 years agoMerge "DropBoxManager: Allow adding a file using an fd"
Treehugger Robot [Fri, 26 Jan 2018 15:51:57 +0000 (15:51 +0000)]
Merge "DropBoxManager: Allow adding a file using an fd"

6 years agoDropBoxManager: 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

6 years agoMerge "Track removal of Os.waitpid(..., Int32Ref, ...) from API."
Tobias Thierer [Fri, 26 Jan 2018 13:05:06 +0000 (13:05 +0000)]
Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API."

6 years agoMerge "Add dalvik.vm.minidebuginfo property for ART"
David Srbecky [Fri, 26 Jan 2018 12:37:48 +0000 (12:37 +0000)]
Merge "Add dalvik.vm.minidebuginfo property for ART"

6 years agoCopy hidden API blacklist/dark greylist into build folder
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

6 years agoAdd Tethering's UID to the legacy type NetworkCapabilities
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

6 years agoMerge "Watchdog: Add statsd to interesting processes"
Treehugger Robot [Fri, 26 Jan 2018 03:52:14 +0000 (03:52 +0000)]
Merge "Watchdog: Add statsd to interesting processes"

6 years agoMerge "Add Voice / Data network specific reg states."
Xiangyu/Malcolm Chen [Fri, 26 Jan 2018 00:41:27 +0000 (00:41 +0000)]
Merge "Add Voice / Data network specific reg states."

6 years agoMerge "Deprecate android.util.Mutable*."
Treehugger Robot [Fri, 26 Jan 2018 00:28:52 +0000 (00:28 +0000)]
Merge "Deprecate android.util.Mutable*."

6 years agoMerge "Open Mobile API for frameworks/base"
Ruchi Kandoi [Thu, 25 Jan 2018 23:30:50 +0000 (23:30 +0000)]
Merge "Open Mobile API for frameworks/base"

6 years agoSupport Background Service Limitations.
hirotaka motegi [Fri, 12 Jan 2018 10:09:34 +0000 (19:09 +0900)]
Support Background Service Limitations.

In order to receive SMS-Push,
Target SDK will use "Context.startForegroundService ()" API
for more than 26 service applications.

Test: manual

Bug: 63048126
Change-Id: I701eab6002d01cfc6e559db7aad5455781dc162c
Signed-off-by: hirotaka motegi <hirotaka.motegi.um@nttdocomo.com>
6 years agoMerge "Show a warning toast/dialog when an app uses hidden APIs"
David Brazdil [Thu, 25 Jan 2018 19:53:13 +0000 (19:53 +0000)]
Merge "Show a warning toast/dialog when an app uses hidden APIs"

6 years agoMerge "Tcp socket metrics: implement INetdEventListener callback"
Treehugger Robot [Thu, 25 Jan 2018 19:23:18 +0000 (19:23 +0000)]
Merge "Tcp socket metrics: implement INetdEventListener callback"

6 years agoAdd Voice / Data network specific reg states.
Malcolm Chen [Thu, 25 Jan 2018 00:27:09 +0000 (16:27 -0800)]
Add Voice / Data network specific reg states.

In NetworkRegistrationState.java, add hidden inner classes that
stores information specific to voice network registration state
and data network registration state.

Bug: 64132030
Test: build
Change-Id: I746be2a50cfa138acc5b2b40e38ab875ceab6d8d

6 years agoMerge "ActivityManager: Add support for agents on startup"
Treehugger Robot [Thu, 25 Jan 2018 18:08:07 +0000 (18:08 +0000)]
Merge "ActivityManager: Add support for agents on startup"

6 years agoOpen Mobile API for frameworks/base
Ruchi Kandoi [Fri, 8 Dec 2017 23:07:03 +0000 (15:07 -0800)]
Open Mobile API for frameworks/base

This contribution is an implementation of the GlobalPlatform
Open Mobile API for Android with some modifications to
namespaces and packages to make it suitable as a core
Android component.

This contribution is based on
0001-Open-Source-Contribution-of-Smartcard-Service-for-fr.patch
which can be found in
https://portland.source.codeaurora.org/patches/quic/la/PATCH_217881_OpenMobileAPI_20171206.tar.gz

The submitted patch was derived from
https://source.codeaurora.org/quic/la/platform/packages/apps/SmartCardService/commit/?h=LA.BF64.1.2.1&id=06ecea9abb8264049f52c7e31c0bc13330a425d5.

Test: Sample Application; open Channels and transmit APDUs

Change-Id: Iac5206bd84798ca0fcdb504c89e1da5383012a5a
Signed-off-by: Jeremy O'Donoghue <jodonogh@codeaurora.org>
6 years agoMerge "Fill in methods in EuiccCardController."
Holly Jiuyu Sun [Thu, 25 Jan 2018 17:22:50 +0000 (17:22 +0000)]
Merge "Fill in methods in EuiccCardController."

6 years agoMerge "PrintSpooler: Fix EqualsNaN in test"
Treehugger Robot [Thu, 25 Jan 2018 15:05:27 +0000 (15:05 +0000)]
Merge "PrintSpooler: Fix EqualsNaN in test"

6 years agoTrack removal of Os.waitpid(..., Int32Ref, ...) from API.
Tobias Thierer [Wed, 24 Jan 2018 13:25:51 +0000 (13:25 +0000)]
Track removal of Os.waitpid(..., Int32Ref, ...) from API.

Test: Treehugger
Bug: 70985234

(cherry picked from commit 08005bbe9157c84f88189a7d7e9db466324af910)

Change-Id: I62229d01c13ac12e8c263e601d46ceb4f7ae7a0e
Merged-In: I62229d01c13ac12e8c263e601d46ceb4f7ae7a0e

6 years agoMerge "Update CellInfo API to accomodate new fields."
Treehugger Robot [Thu, 25 Jan 2018 12:50:37 +0000 (12:50 +0000)]
Merge "Update CellInfo API to accomodate new fields."

6 years agoDeprecate android.util.Mutable*.
Tobias Thierer [Wed, 24 Jan 2018 13:40:56 +0000 (13:40 +0000)]
Deprecate android.util.Mutable*.

Since http://r.android.com/565744 , these classes do not appear
in the signature of any other Android API. There are no plans to
make them part of any future API signatures.

They do not provide useful abstractions because:
 - They lack encapsulation and functionality (value is nonfinal;
   lack of equals/hashCode and toString).
 - It's trivial for apps to implement similar types for their
   internal use.

Only three of these eight classes (Mutable{Int,Long,Boolean}) are
used internally in Android; most of these usages could be written
better with named, more specific classes.

Therefore these classes do not pull their own weight on the API
surface of android.util.

This CL deprecates all eight classes in preparation for removing
them from the Android API surface at some point in the future, and
to allow the unused classes to be removed entirely.

Bug: 71546998
Test: Treehugger

(cherry picked from commit d57219411b3718da0850ef109e63d1a311a03d31)

Change-Id: Ib8736faa86d0ae5eec2c47a294f21adcf21d3dc4
Merged-In: I1cc1eb5ca9c36749bbb9a233d60036f6319bf2d3

6 years agoMerge "Create hidden API lists"
David Brazdil [Thu, 25 Jan 2018 07:55:35 +0000 (07:55 +0000)]
Merge "Create hidden API lists"

6 years agoMerge "Add ServiceState APIs for carrier aggregation."
Treehugger Robot [Thu, 25 Jan 2018 07:47:55 +0000 (07:47 +0000)]
Merge "Add ServiceState APIs for carrier aggregation."

6 years agoUpdate CellInfo API to accomodate new fields.
Eric Schwarzenbach [Wed, 10 Jan 2018 19:33:52 +0000 (11:33 -0800)]
Update CellInfo API to accomodate new fields.

Adds CellConnectionStatus to top level CellInfo type. Adds cell bandwidth
to the CellIdentityLte.

Bug: 72117223
Test: runtest frameworks-telephony

Change-Id: Id5f3b5a2bd4119c099f5e739d5579974e7adc897

6 years agoMerge "Add slotId in INetworkService.aidl methods."
Treehugger Robot [Thu, 25 Jan 2018 07:13:17 +0000 (07:13 +0000)]
Merge "Add slotId in INetworkService.aidl methods."

6 years agoMerge "Move Keepalive out of IpSecTransform.Builder"
nharold [Thu, 25 Jan 2018 05:50:33 +0000 (05:50 +0000)]
Merge "Move Keepalive out of IpSecTransform.Builder"

6 years agoMerge "Fix a bug where a NetworkAgent gets repeatedly torn down"
Chalard Jean [Thu, 25 Jan 2018 05:37:21 +0000 (05:37 +0000)]
Merge "Fix a bug where a NetworkAgent gets repeatedly torn down"

6 years agoPrintSpooler: Fix EqualsNaN in test
Andreas Gampe [Thu, 25 Jan 2018 02:37:07 +0000 (18:37 -0800)]
PrintSpooler: Fix EqualsNaN in test

Fix NaN comparisons in WorkflowTest.

Bug: 72451126
Test: m javac-check RUN_ERROR_PRONE=true
Merged-In: I3eba48ac3f8dc343cd22cac0f9fbf4d4e6c76631
Change-Id: I19db273ee442c912c2c1052d53b5b2e0c5cd968b

6 years agoFix a bug where a NetworkAgent gets repeatedly torn down
Chalard Jean [Thu, 25 Jan 2018 00:41:51 +0000 (09:41 +0900)]
Fix a bug where a NetworkAgent gets repeatedly torn down

mUids is not marshalled correctly when null so if the
NetworkAgent runs in another process and is not a VPN then
the system will see its allowed Uids as being the empty
list (= nobody can use this network) instead of a null
list (= everybody can use this network). This breaks
emulator networking.

Bug: 72436966
Test: runtests frameworks-net
Test: also manual testing, this does fix emulator networking
      and seems not to break phone networking
Change-Id: Id2bbf3808e80b19cd055c832c11cf72372710942

6 years agoTcp socket metrics: implement INetdEventListener callback
Hugo Benichi [Tue, 23 Jan 2018 02:43:16 +0000 (11:43 +0900)]
Tcp socket metrics: implement INetdEventListener callback

This patch implements the new INetdEventListener.onTcpSocketStatsEvent
callback added in INetdEventListener.

For the time being, tcp socket stats are tracked inside TcpMetrics only
for dumpsys printing and bug report integration as a first step.

Bug: 64147860
Test: manually tested, watching output of
      $ adb shell dumpsys connmetrics
Change-Id: I10ab24c6da4bb654d9198a4d8d00ccdc972cc0d5

6 years agoMove Keepalive out of IpSecTransform.Builder
Nathan Harold [Thu, 7 Dec 2017 03:12:28 +0000 (19:12 -0800)]
Move Keepalive out of IpSecTransform.Builder

The lifecycle of Keepalive offloading is, unfortunately
different from that of an IpSecTransform. Because starting
a keepalive is fundamentally asynchronous, and isn't valid
until after a transform exists, it will now be a separate
optional procedure that may succeed or fail. It remains
linked with a Transform by the need for a Transform to exist
in order to initiate a Keepalive.

Bug: 38350389
Test: compilation
Change-Id: Ia76fccee41f86d694dff436043293d0c0762c041

6 years agoMerge "Add FLAG_ACTIVITY_NEW_TASK when starting UI-based tether provisioning."
Treehugger Robot [Thu, 25 Jan 2018 03:09:27 +0000 (03:09 +0000)]
Merge "Add FLAG_ACTIVITY_NEW_TASK when starting UI-based tether provisioning."

6 years agoMerge "Adds stripTrailingFs"
Treehugger Robot [Thu, 25 Jan 2018 02:44:26 +0000 (02:44 +0000)]
Merge "Adds stripTrailingFs"

6 years agoFill in methods in EuiccCardController.
Holly Jiuyu Sun [Thu, 18 Jan 2018 23:16:31 +0000 (15:16 -0800)]
Fill in methods in EuiccCardController.

Add RESULT_UNKNOWN in EuiccCardManager.

Bug: 38206971
Test: test on phone
Change-Id: I972ba0ab5ff6bb8e6ef50c8684a19bb9cd48a721

6 years agoWatchdog: Add statsd to interesting processes
Andreas Gampe [Thu, 25 Jan 2018 01:55:17 +0000 (17:55 -0800)]
Watchdog: Add statsd to interesting processes

Dump statsd stacks on watchdog abort.

Bug: 72461610
Test: m
Change-Id: I01e1fa4fb4ba6e2644f9bf4464cc010bb4e82215

6 years agoActivityManager: Add support for agents on startup
Andreas Gampe [Mon, 22 Jan 2018 23:15:54 +0000 (15:15 -0800)]
ActivityManager: Add support for agents on startup

Add setAgentApp similar to setDebugApp. If given, attempt to attach the given
agent during handleBindApplication.

The flow needed a slight refactor. It is not possible to do a debuggability
check at setAgentApp time (without checking all installed apps). Instead,
when a ProfilerInfo contains an agent, perform a debuggability check then.
This is consistent with how setDebugApp works.

Expose through the shell command:

  cmd activity set-agent-app process agent

Add CTS coverage.

Bug: 69929492
Test: m
Test: m cts
Test: cts-tradefed run commandAndExit cts-dev -m CtsJvmtiAttachingHostTestCases
Change-Id: I65e869debd45e6073f9ab21cb9de9c9deb828a2e

6 years agoAdd slotId in INetworkService.aidl methods.
Malcolm Chen [Wed, 24 Jan 2018 01:35:51 +0000 (17:35 -0800)]
Add slotId in INetworkService.aidl methods.

Since one Service can only return same binder to all connected
clients, we add slotId in INetworkService.aidl methods to redirect
requests to correct provider.

Bug: 64132030
Test: build
Change-Id: Iae5d81a689a43ed783d7dff0f51735c42a6483be

6 years agoMerge "Update comments for ACTION_CARRIER_CONFIG_CHANGED."
Treehugger Robot [Thu, 25 Jan 2018 01:33:33 +0000 (01:33 +0000)]
Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED."

6 years agoAdd ServiceState APIs for carrier aggregation.
Eric Schwarzenbach [Thu, 18 Jan 2018 22:42:00 +0000 (14:42 -0800)]
Add ServiceState APIs for carrier aggregation.

Adds getDuplexMode, getChannelNumber, and getCellBandwidths to
ServiceState.

Bug: 72117602
Test: runtest
Change-Id: I04be7d0a7d88693ef21b252ecc21aa974c2f89c8

6 years agoMerge "BitmapDrawable: Suppress errorprone warning"
Andreas Gampe [Thu, 25 Jan 2018 00:56:11 +0000 (00:56 +0000)]
Merge "BitmapDrawable: Suppress errorprone warning"

6 years agoFix nav keys being tiny on sw600dp devices
Jason Monk [Thu, 25 Jan 2018 00:19:20 +0000 (19:19 -0500)]
Fix nav keys being tiny on sw600dp devices

Test: visual
Change-Id: I4e7ce2e7d102c980a0953a3f8f8422933a4b1923
Fixes: 68268902

6 years agoMerge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps"
Treehugger Robot [Wed, 24 Jan 2018 23:09:28 +0000 (23:09 +0000)]
Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps"

6 years agoUpdate comments for ACTION_CARRIER_CONFIG_CHANGED.
Amit Mahajan [Wed, 24 Jan 2018 20:54:44 +0000 (12:54 -0800)]
Update comments for ACTION_CARRIER_CONFIG_CHANGED.

Test: none
Bug: 64131518
Change-Id: I7efbbb393289cc11d529898ea3d7f96b0e89f445

6 years agoMerge "Add scan interval and window lengths to Settings.Global."
Treehugger Robot [Wed, 24 Jan 2018 21:49:00 +0000 (21:49 +0000)]
Merge "Add scan interval and window lengths to Settings.Global."

6 years agoSet Zygote.DISABLE_HIDDEN_API_CHECKS for system apps
David Brazdil [Wed, 17 Jan 2018 18:06:47 +0000 (18:06 +0000)]
Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps

When forking a process for a system app, pass a flag to ART that
will disable enforcement of hidden API access checks.

Test: manual
Bug: 64382372
Change-Id: I5ba81d84a44c9467613f060428b11e1d9d725bd3

6 years agoBitmapDrawable: Suppress errorprone warning
Andreas Gampe [Wed, 24 Jan 2018 21:25:22 +0000 (13:25 -0800)]
BitmapDrawable: Suppress errorprone warning

Suppress a warning for constructor-chaining not using all parameters.

Bug: 72451126
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Ie47dec119ec578b79d866d9c5041bb7b68eac146

6 years agoMerge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."""
Holly Jiuyu Sun [Wed, 24 Jan 2018 21:11:07 +0000 (21:11 +0000)]
Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."""

6 years agoCreate hidden API lists
David Brazdil [Mon, 22 Jan 2018 22:23:13 +0000 (22:23 +0000)]
Create hidden API lists

Android is beginning to put restrictions on the usage of private APIs.
In order to facilitate a transitionary period, some APIs will remain
accessible but issue a warning (greylist), other will see restrictions
right away (blacklist).

This patch create two new text files which will be used to store manual
lists of dex signatures of hidden APIs. These are the blacklist and
dark greylist. They should be mutually exclusive and both be subsets of
INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE. The last list, light greylist,
is generated as INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE minus the two
manual lists.

Bug: 64382372
Test: m
Change-Id: Ia694ef79bece819c87db853ccaea5e95f38d3e84

6 years agoAdds stripTrailingFs
Jun Yin [Wed, 24 Jan 2018 20:13:37 +0000 (12:13 -0800)]
Adds stripTrailingFs

This function removes padding 'F' characters in a string (e.g., ICCID).

Bug: 38206971
Test: unit test in another cl
Change-Id: If77604576c5bd26404cdc436f8297191664325a4

6 years agoMerge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps"
Treehugger Robot [Wed, 24 Jan 2018 20:28:21 +0000 (20:28 +0000)]
Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps"

6 years agoShow a warning toast/dialog when an app uses hidden APIs
David Brazdil [Wed, 24 Jan 2018 19:54:30 +0000 (19:54 +0000)]
Show a warning toast/dialog when an app uses hidden APIs

Check VMRuntime.hasUsedHiddenApi() on each Activity start and show
a toast/dialog urging the user to check logcat.

Test: manual
Bug: 64382372
Change-Id: Ida8a6ed9ab9b56a76882501b2a3473a5f1448cb3

6 years agoMerge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario."
Treehugger Robot [Wed, 24 Jan 2018 19:33:33 +0000 (19:33 +0000)]
Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario."

6 years agoMerge "Added network service interface"
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 19:13:58 +0000 (19:13 +0000)]
Merge "Added network service interface"

6 years agoAdded network service interface
Jack Yu [Thu, 21 Dec 2017 19:00:05 +0000 (11:00 -0800)]
Added network service interface

The interface for mobile network service. This is the base class
for vendor or first party data service provider to implement
the network service for cellular or IWLAN network support.

Test: Manual
bug: 64132030
Change-Id: Ia358cbb18fc6d15dcc45c75f14b7c952f899e101

6 years agoAdded slot id in the internal API
Jack Yu [Wed, 24 Jan 2018 01:35:18 +0000 (17:35 -0800)]
Added slot id in the internal API

For multiple clients, only one binder will be returned
by the system. Given this fact we need to add slot id into
the internal API to distinguish between requests from different
slots.

Test: Manual
Bug: 64132030
Change-Id: I0272eebf6e4413ecc6b4a2b33b87e259cd2afaa5

6 years agoMerge "Add tunnel-mode calls to netd in IpSecService"
Benedict Wong [Wed, 24 Jan 2018 18:10:55 +0000 (18:10 +0000)]
Merge "Add tunnel-mode calls to netd in IpSecService"

6 years agoMerge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP"
Treehugger Robot [Wed, 24 Jan 2018 18:03:21 +0000 (18:03 +0000)]
Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP"

6 years agoRevert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""
Holly Jiuyu Sun [Wed, 24 Jan 2018 17:57:39 +0000 (17:57 +0000)]
Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""

This reverts commit 5c9dcc0e7202884b3a4a54c28f30854f377fde29.

Reason for revert: The original failure was not caused by this CL and this CL does not depend on the broken one.

Change-Id: Ia60e21f634d8f307f1cf5a3992cb38de04c5f443

6 years agoBT-HFP: Update Bluetooth headset state handler to Multi-HFP
Jack He [Wed, 17 Jan 2018 23:45:12 +0000 (15:45 -0800)]
BT-HFP: Update Bluetooth headset state handler to Multi-HFP

* When multiple headset devices are connected at the same time, at most one
  device can be used for SCO audio at any time. This device is called
  Active Device and is indicated by either
  BluetoothHeadset.getActiveDevice() or
  BluetoothHeadset.ACTIVE_DEVICE_CHANGED intent. It can also be set
  through BluetoothHeadset.setActiveDevice(BluetoothDevice) internal API.
* This change let AudioService to listen to ACTIVE_DEVICE_CHANGED intent
  instead of CONNECTION_STATE_CHANGED intent since it is the active
  device that AudioService cares about, not the list of connected
  devices.
* Everytime a new active device is set, AudioService will treat the old
  one (if not null) as disconnected and call disconnection methods in
  audio framework and the new active device is regarded as newly
  connected and connection methods will be called by AudioService.
* When disconnectHeadset() is called, active device will be set to null

Bug: 71875419
Test: compile, connect multiple HFP devices and switch active device
      among them
Change-Id: I148cca079d36a2dfc6a46b8d42ba69821c9c6de3

6 years agoMerge "Add PhysicalChannelConfig."
Eric Schwarzenbach [Wed, 24 Jan 2018 16:17:53 +0000 (16:17 +0000)]
Merge "Add PhysicalChannelConfig."

6 years agoAdd dalvik.vm.minidebuginfo property for ART
David Srbecky [Tue, 23 Jan 2018 17:57:24 +0000 (17:57 +0000)]
Add dalvik.vm.minidebuginfo property for ART

The property enables generation of mini-debug-info for JIT.

Change-Id: I1cfce8b1b463d9e45bbe823c285c1639653bb1b5

6 years agoSet DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps
David Brazdil [Thu, 18 Jan 2018 15:25:18 +0000 (15:25 +0000)]
Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps

For now, system apps will be exempt from hidden API access checks.
Pass the appropriate flag to dexopt.

Test: manual
Bug: 64382372
Bug: 72305689
Merged-In: I5676ffa3a5ba680bf5f6bab0b62f0acf4a933097
Change-Id: Idc3067d2c6040f15fe0f051090ba45efe591ebae

6 years agoMerge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""
Nicolas Geoffray [Wed, 24 Jan 2018 10:44:10 +0000 (10:44 +0000)]
Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""

6 years agoMerge "Fail when there is an ASM error"
Benoit Lamarche [Wed, 24 Jan 2018 09:59:28 +0000 (09:59 +0000)]
Merge "Fail when there is an ASM error"

6 years agoRevert "Add getUiccSlots() and switchSlots() in TelephonyManager."
Nicolas Geoffray [Wed, 24 Jan 2018 09:11:40 +0000 (09:11 +0000)]
Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."

AOSP build broken.

Bug: 71914112

This reverts commit 2f87d7b2ee5097eae4e2a62858fbe221dac857f6.

Change-Id: I53537a6da7616fe6dbbb79927b32720bbeaf1f69

6 years agoAdd tunnel-mode calls to netd in IpSecService
Benedict Wong [Sat, 20 Jan 2018 01:36:02 +0000 (17:36 -0800)]
Add tunnel-mode calls to netd in IpSecService

Adds calls to relevant netd methods in IpSecService, enabling Tunnel
mode functionality.

Bug: 63588681
Test: Compiles, passing CTS + unit tests
Change-Id: I6deb68584cddb03f21bd76370d4ef69cadc1bf16

6 years agoMerge "Add TunnelInterface API and KernelResourceRecords"
Benedict Wong [Wed, 24 Jan 2018 07:25:04 +0000 (07:25 +0000)]
Merge "Add TunnelInterface API and KernelResourceRecords"