OSDN Git Service

android-x86/frameworks-base.git
7 years agoRefactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
Felipe Leme [Thu, 18 Aug 2016 23:20:01 +0000 (16:20 -0700)]
Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.

Test: m -j32 FrameworksServicesTests && adb install -r -g ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && adb shell am instrument -e class "com.android.server.net.NetworkStatsServiceTest" -w "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

BUG: 30943463

(cherry picked from commit b8f946dc4b24998f14e28573e452ab13ed533347)

Change-Id: Ia9929295ab2396a7ebb133e65d157f98414e4dfa

7 years agoUse @Ignore to explicitly disable a @Test method.
Felipe Leme [Mon, 22 Aug 2016 15:50:43 +0000 (08:50 -0700)]
Use @Ignore to explicitly disable a @Test method.

BUG: 30839080
BUG: 31007021

(cherry picked from commit fc7d7a359f800d7320d29055ef3b4b75157aaf13)

Change-Id: I35942e60493adebb22871541a34240368c691ee7

7 years agoFixed NetworkStatsServiceTest and converted it to JUnit4.
Felipe Leme [Thu, 18 Aug 2016 22:31:45 +0000 (15:31 -0700)]
Fixed NetworkStatsServiceTest and converted it to JUnit4.

Most tests were failing because due to a null NetworkCapabilities.
Example:

1) testNetworkStatsWifi(com.android.server.net.NetworkStatsServiceTest)
java.lang.NullPointerException: Attempt to invoke virtual method 'boolean android.net.NetworkCapabilities.hasCapability(int)' on a null object reference
at
com.android.server.net.NetworkStatsService.updateIfacesLocked(NetworkStatsService.java:983)

BUG: 30839080

(cherry picked from commit 574f370c6da52eeffe747248d68ef044617c7bcf)

Change-Id: Ie09b2f43cf6ec745e404d5ec98bd0b072d211ea3

7 years agoVPN network stat accounting changes.
Jeremy Joslin [Mon, 8 Aug 2016 23:07:37 +0000 (16:07 -0700)]
VPN network stat accounting changes.

Properly account for VPN apps that make heavy use of the tun
interface. Prior to this change a VPN app could be incorrectly charged
for more data than it actually used if it sent more traffic through
the tun interface than the underlying interface.

This change excludes VPN app traffic on the tun interface from the
adjustment pool and doesn't redistribute traffic to the VPN app.
Instead all of the redistributed traffic is deducted from the VPN app
which effectively represents any overhead incurred by the VPN app.

BUG: 30557871

(cherry picked from commit 8b436d865c9f287e9ae491e5278cd8874f4a865b)

Change-Id: I06f01aa8fe5fdc06b2d36cfb9c68feb244c2e5de

7 years agoConnectivityThread: use lazy holder idiom
Hugo Benichi [Thu, 13 Oct 2016 07:48:42 +0000 (16:48 +0900)]
ConnectivityThread: use lazy holder idiom

This patch changes the way that the ConnectivityThread is lazily
instantiated by using the "lazy initialization holder class idiom".

The first code point that tries to obtain a reference to the unique
ConnectivityThread instance will trigger the creation of the Singleton
class, which will guarantee a thread-safe initialization of the static
INSTANCE field inside Singleton according to the language specs.

This is the Item #71 of Effective Java.

The unique static instance of ConnectivityThread is not stored directly
inside ConnectivityThread class but is stored in a static nested class.
This is to avoid triggering the creation of that unique instance when
Zygote does class preloading at phone startup. Otherwise this would lead
to Zygote creating a new OS thread during preloading, which is a fatal
error.

Test: frameworks-wifi tests pass
Bug: 26749700
Bug: 28537383
Bug: 32130437

(cherry picked from commit c4fe5d373caa9f53686e4d58e61394dd40558957)

Change-Id: If13b363889a8e9396273a90c3d9f9421a48aecbc

7 years agoConnectivityManager: use ConnectivityThread looper
Hugo Benichi [Thu, 7 Jul 2016 01:15:56 +0000 (10:15 +0900)]
ConnectivityManager: use ConnectivityThread looper

This patch removes the static singleton looper used by
ConnectivityManager and instead uses the common ConnectivityThread.

This allows to removes the static atomic counter used to track
the number of registered NetworkCallback in ConnectivityManager, because
the looper is not turned off anymore when no callbacks are registered.

Also an overloaded version of sendRequestForNetwork is added taking as a
new parameter a Handler. This will allow to overload various callback
and request related API calls with user provided Handlers.

Test: ConnectivityServiceTest passes
Bug: 26749700
Bug: 28537383
Bug: 32130437

(cherry picked from commit 7724cdd8b90006c852644d06cf6c8a28450c71c6)

Change-Id: If956addbf8e7b11b36a4b966de7fca00e8f362c1

7 years agoConnectivityManager: a simpler CallbackHandler
Hugo Benichi [Wed, 6 Jul 2016 13:53:17 +0000 (22:53 +0900)]
ConnectivityManager: a simpler CallbackHandler

This patch simplifies CallbackHandler in the following way:
  - CallbackHandler directly uses the static references to
    sNetworkCallback and sCallbackRefCount. This allows to remove
    instance fields in CallbackHandler.
  - CallbackHandler does not have a reference to ConnectivityManager
    anymore
  - CallbackHandler.getObject() is now generic in a type-safe way.

Test: ConnectivityServiceTest passes
Bug: 28537383
Bug: 32130437

(cherry picked from commit d42650faaa33ec6274278c65a6042228555ddd4f)

Change-Id: I1b5fe2a361b5f623a8310ae698497c83d72f3034

7 years agoIndicate the NsdServiceInfo attributes are only filled in for a resolved service.
Philip P. Moltmann [Mon, 18 Apr 2016 23:23:06 +0000 (16:23 -0700)]
Indicate the NsdServiceInfo attributes are only filled in for a resolved service.

Fixes: 28530428

(cherry picked from commit 7d5da4b044183826ac8388c8bdb94ac979a81797)

Change-Id: If2bfc06589adb361f11b89cd5923cb5c255cb680

7 years agoAdd a null check for the OnStartTetheringCallback.
Jeremy Klein [Sun, 13 Mar 2016 00:29:54 +0000 (16:29 -0800)]
Add a null check for the OnStartTetheringCallback.

This avoids a NullPointerException when trying to call the callback
and gives a more readable error message.

(cherry picked from commit 5f277e1667b49976a77c9fa79b9a04d775f3b49e)

Change-Id: Ia419ff68ef10f308f9e44be47420e27099ee6070

7 years agoTokenBucket for rate-limiting and throttling
Hugo Benichi [Mon, 17 Oct 2016 23:43:30 +0000 (08:43 +0900)]
TokenBucket for rate-limiting and throttling

This patch adds a TokenBucket class that can accumulate and distribute
tokens over time.

Test: comes with unit tests.
Bug: 32198637

(cherry picked from commit 998493f0ee39ae0e9ffdea27f48f1b11b0807fcb)

Change-Id: I4012ae6d02f7004bceee9a2ba03914f2a2506031

7 years agoIpConnectivityMetrics reads buffer size in settings
Hugo Benichi [Wed, 19 Oct 2016 02:17:28 +0000 (11:17 +0900)]
IpConnectivityMetrics reads buffer size in settings

Test: IpConnectivityMetricsTest passes. Also manually changed the new
setting and verified the buffer size is as expected after flushing the
buffer.
Bug: 32198637

(cherry picked from commit 05686dbb6b965eb1a54591d2ed2334337886c6ee)

Change-Id: Iefbeac3a688b260fb3f92dfe0bfd9db28e26749d

7 years agoCaptivePortalLogin: set mixed content policy to compatibility.
Lorenzo Colitti [Fri, 21 Oct 2016 09:41:25 +0000 (18:41 +0900)]
CaptivePortalLogin: set mixed content policy to compatibility.

This makes the policy for mixed HTTP/HTTPS content match Chrome.
This allows us to display login pages where unimportant
subresources are HTTP.

Bug: 32171569

(cherry picked from commit 625166377b2d7c5f09d1e7617b3eac3a464fba53)

Change-Id: Ia82958192d978280715442e182c34f9da5c88c66

7 years agoAdd IP conn metrics to dumpsys and bug reports
Hugo Benichi [Wed, 19 Oct 2016 04:48:40 +0000 (13:48 +0900)]
Add IP conn metrics to dumpsys and bug reports

Test: manually created a bug report and inspected content.

(cherry picked from commit 51d14cb60793a9a073b8a29ff7875bb518cd7d54)

Change-Id: I9649cc2f9bb7a1975e60baaae55fcdb2a48c3b93

7 years agoIpConnectivity metrics: add version number
Hugo Benichi [Thu, 13 Oct 2016 04:16:16 +0000 (13:16 +0900)]
IpConnectivity metrics: add version number

This patch adds a version field to ipconnectivity.proto and populates it
to 2, which is the logical version number for NYC-MR2.

Test: IpConnectivity{EventBuilder,Metrics}Test pass
Bug: 32127906

(cherry picked from commit d680d4c856f54bea0c60dea74ba4204822391e49)

Change-Id: If8f167c0dc4c1abe0e235e2adfd131168a4ddc52

7 years ago[CS] Remove timeout event after first available
Etan Cohen [Thu, 27 Oct 2016 22:05:50 +0000 (15:05 -0700)]
[CS] Remove timeout event after first available

Guarantees that timeouts are only delivered if a network never
becomes available. Once a network is available the timeout is
canceled.

Bug: 31402633
Test: all timeout related unit tests pass (new one added)

(cherry picked from commit 681fcda5896fd6c94f8a543ef9983c0a0644e87e)

Change-Id: I7cd3086544c881915fc6dbf14b87a24ab0cd8748

7 years agoApfTest: tag tests with @SmallTest or @MediumTest
Hugo Benichi [Wed, 2 Nov 2016 04:43:22 +0000 (13:43 +0900)]
ApfTest: tag tests with @SmallTest or @MediumTest

Test methods not tagged with @{Small,Medium,Large}Test will not appear
in the Android Platform Continuous Testing dashboard.

Test methods tagged with @LargeTest will not be run in the Android
Platform Continuous Testing dashboard.

Test: ApfTest passes ($runtest frameworks-net)
Bug: 31479480

(cherry picked from commit 4195c28347cc100954f83c3c92b4dde4673f8608)

Change-Id: Ia215fc8e2ccc61f6223c24fdf390e1e759de302f

7 years agoUnbreak TetherInterfaceStateMachineTest.
Lorenzo Colitti [Fri, 28 Oct 2016 08:45:55 +0000 (17:45 +0900)]
Unbreak TetherInterfaceStateMachineTest.

This was broken by the implementation of IPv6 tethering, which
relies on various private classes which end up calling unmockable
final classes like NetworkInterface.

Making everything public like this is almost certainly not the
best way of fixing this test, but on the other hand there is
value to the test continuing to pass.

Test: runtest frameworks-net  # Everything passes.
Test: IPv6 tethering continues to work.

(cherry picked from commit 7e0eeca8ba4063d0d35dda9a8dfcc612e45efb87)

Change-Id: I8a3cf466871c026f4ae0f5cfa73071338cdf5b7e

7 years agoMove the connectivity tests to frameworks/base/tests/net.
Lorenzo Colitti [Fri, 28 Oct 2016 03:48:36 +0000 (12:48 +0900)]
Move the connectivity tests to frameworks/base/tests/net.

This will give us a good place to put all the networking tests.

Fix: 31479480
Test: adb  shell am instrument -w -e notClass com.android.server.connectivity.tethering.TetherInterfaceStateMachineTest 'com.android.frameworks.tests.net/android.support.test.runner.AndroidJUnitRunner'  # PASS

(cherry picked from commit ecc986d430f4b8158f177ed97d2edb741f11ff71)

Change-Id: I993eeaa5dec001c39389023f355f506129b356e7

7 years agoDe-guava BroadcastInterceptingContext and move it to testutils.
Lorenzo Colitti [Fri, 28 Oct 2016 03:56:03 +0000 (12:56 +0900)]
De-guava BroadcastInterceptingContext and move it to testutils.

Removing the static dependency on guava reduces test compile time
by about 20 seconds on a Z840, thus substantially speeding up the
compile/test cycle.

Make FutureIntent public instead of package-private because it is
used directly by NetworkPolicyManagementServiceTest, which as of
this CL is now in a different package.

(cherry picked from commit 281a17c9580de5c9898be7d9654d428801976511)

Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest  # PASS
Test: runtest frameworks-services -c com.android.server.NetworkPolicyManagerServiceTest  # PASS
Test: runtest frameworks-services -c com.android.server.net.NetworkStatsServiceTest  # PASS
Test: runtest frameworks-services -c com.android.server.NetworkManagementServiceTest  # Already failing.
Bug: 31479480
Change-Id: Ifab32c9214e9caab71dbf93b3d3ca88df6f49636

7 years agoMove FakeSettingsProvider to a common location.
Lorenzo Colitti [Fri, 28 Oct 2016 03:37:38 +0000 (12:37 +0900)]
Move FakeSettingsProvider to a common location.

(cherry picked from commit 7df1a82802cdf842d07a86a80383c7d5ea7ae53a)

Test: runtest frameworks-util -c com.android.internal.util.test.FakeSettingsProviderTest
Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest
Test: runtest frameworks-services -c com.android.server.retaildemo.PreloadAppsInstallerTest
Test: runtest frameworks-services -c com.android.server.retaildemo.RetailDemoModeServiceTest
Bug: 31479480
Change-Id: I8d4d4de2937012dd33924f53e68f96241a9b2b4f

7 years agoConnectivityServiceTest: mark flaky test as such
Hugo Benichi [Mon, 17 Oct 2016 06:54:51 +0000 (15:54 +0900)]
ConnectivityServiceTest: mark flaky test as such

This patch extracts into its own independent test a test sub-block looking
for a race condition when not waiting on handlers to become idle:
there is no way to prevent the race from not happening when looking for
it this way. This makes the test flakky.

This new independent test is tagged with @FlakkyTest(tolerance = 3).

Test: ConnectivityServiceTest passes, with higher probability.
Bug: 31479480

(cherry picked from commit c8c1027762d66c12c9c153ccbb8f80acdee8571c)

Change-Id: I3c702bd981ed80ed606be0fb52d61eb3d7195a6f

7 years agoAdd option to skip and avoid captive portals.
Calvin On [Tue, 11 Oct 2016 22:10:46 +0000 (15:10 -0700)]
Add option to skip and avoid captive portals.

Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug: 30222699

(cherry picked from commit be96da11ccb5dd500f920c3ba90d350857293b3d)

Change-Id: I90c0f97fe0e41de4059bceae7b56ab3a70145696

7 years agoApfFilter: use elapsedRealTime for RA lifetime
Hugo Benichi [Mon, 17 Oct 2016 05:21:33 +0000 (14:21 +0900)]
ApfFilter: use elapsedRealTime for RA lifetime

This patch replaces System.currentTimeMillis() with
SystemClock.elapsedRealTime() to make RA lifetime computation more
resilient to various external events inducing jumps in
currentTimeMillis().

Test: ApfTest passes.

(cherry picked from commit 305af8e98a4fce712c1a93daf3b050dac2e8b91a)

Change-Id: If19011fc0c905948f2e42b975cfcc5f8672a95fb

7 years agoDo not synchronize boolean reads/writes
Hugo Benichi [Tue, 4 Oct 2016 02:24:12 +0000 (11:24 +0900)]
Do not synchronize boolean reads/writes

This patch removes the synchronization around the private variable
mRunning inside of IpReachabilityMonitor and instead qualifeis the field
as volatile.

Synchronization is not needed for reads/writes on native fields or
object references because they are already guaranteed to be atomic.

Synchronization here was used for enforcing memory visibility across
concurrent threads indirectly through monitor acquire/release.
The volatile keyword achieves this in a more explicit way.

Also, this patch changes the way that probeAll() copies the
IpReachabilityMonitor's mIpWatchList by temporary holding mIpWatchList
keys into an ArrayList instead of a more expensive HashSet. Since Java
HashSet are just degenerated HashMaps, and that key iteration order is
based on key hash, the iteration order over this temporary collection
will be consistent for the same mIpWatchList.

Test: refactoring CL. Existing unit tests still pass.

(cherry picked from commit b0f1186c034c4df9eb54ed29944d16ce6d7ade56)

Change-Id: I48d2b4d837a459150cd431b400ec01b87b48c014

7 years agoApfFilter: systematically use u8, u16, u32 getters
Hugo Benichi [Thu, 13 Oct 2016 00:26:01 +0000 (09:26 +0900)]
ApfFilter: systematically use u8, u16, u32 getters

This patch adds a getUint8 getter for ByteBuffers and changes ApfFilter
to make uses of getUint8/16/32 everywhere.

The return types of getUint16 is also changed from long to int, which
will expand gracefully to long as an unsigned int as it is guaranteed to
be positive after getUint16.

Test: ApfTest passes

(cherry picked from commit 995dd94673005b43d32456e2de5fda0090b23576)

Change-Id: I606ebc5aedfcacde400d27cc6bc37145769b122c

7 years agoAdd fuzzing tests to ApfFilter RA processing
Hugo Benichi [Thu, 6 Oct 2016 06:19:36 +0000 (15:19 +0900)]
Add fuzzing tests to ApfFilter RA processing

Test: added new unit tests

(cherry picked from commit 8acea76a2b7555b3bd5ca1170cca9d09e979fafc)

Change-Id: I847d7e4895766042043c0bba1c9b9a698a705d87

7 years agoSupport timeouts for requestNetwork() invocations.
Erik Kline [Wed, 25 Nov 2015 03:49:38 +0000 (12:49 +0900)]
Support timeouts for requestNetwork() invocations.

(cherry-pick of 06c3ef1367e850746eef0a5462bdce8674d74c30)
(cherry picked from commit 57faba9ec73fbb311d5ca1df3278aee9728589d5)

Bug: 21414325
Change-Id: I1a58823a372154589f972b98c4c428eab0e0523e

7 years agoSilence the obnoxious MTU 0 error message that occur when no MTU is
Pierre Imai [Mon, 8 Feb 2016 07:01:40 +0000 (16:01 +0900)]
Silence the obnoxious MTU 0 error message that occur when no MTU is
specified for a given network.

Bug: 10705136

(cherry picked from commit 54f0d9edbf7f6ea6dd805dc77fdbf2c3848188e2)

Change-Id: I89e2fdfbbfa981d435a2974422d9d9c009872d76

7 years agoMerge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection"
Pavlin Radoslavov [Thu, 26 Jan 2017 04:29:57 +0000 (04:29 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection"
am: 0645c21163

Change-Id: I66a7a5f8dc423c7999b4e0a39a272a837e66c847

7 years agoMerge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection"
Treehugger Robot [Thu, 26 Jan 2017 04:23:42 +0000 (04:23 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection"

7 years agoMerge "Adding Dynamic ImsService Binding (1/3)"
Brad Ebinger [Thu, 26 Jan 2017 01:41:38 +0000 (01:41 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)"
am: 8e6b13a1c0

Change-Id: I8534273da5579b7662e66f80a60348a4665dd65b

7 years agoMerge "Adding Dynamic ImsService Binding (1/3)"
Treehugger Robot [Thu, 26 Jan 2017 01:34:04 +0000 (01:34 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)"

7 years agoAdding Dynamic ImsService Binding (1/3)
Brad Ebinger [Mon, 23 Jan 2017 23:17:50 +0000 (15:17 -0800)]
Adding Dynamic ImsService Binding (1/3)

Adds support for dynamic ImsService Binding (change 1/3). Included
in this change:
- AIDLs for ImsServiceController
- ImsFeature/ImsServiceBase definitions
- KEY_CONFIG_IMS_PACKAGE_OVERRIDE CarrierConfig option

Test: Unit Tests in opt/telephony
Bug: 30290416
Change-Id: Ic4cb1d85a29681b08a6a525c588a72209862dcc3

7 years agoFix wording ambiguity for Bluetooth LDAC Playback Quality selection
Pavlin Radoslavov [Wed, 25 Jan 2017 22:00:02 +0000 (14:00 -0800)]
Fix wording ambiguity for Bluetooth LDAC Playback Quality selection

"Optimize for" -> "Optimized for"

Bug: 34687041
Test: UI Visual inspection
Change-Id: I112ed6451465750978181e6ee35f96fd76969e9c

7 years agoMerge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
Josh Gao [Wed, 25 Jan 2017 21:21:29 +0000 (21:21 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
am: 273b886c49

Change-Id: I82c58cd03c8db78a1733ba5070d314607475cee7

7 years agoMerge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
Josh Gao [Wed, 25 Jan 2017 21:16:57 +0000 (21:16 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."

7 years agoMerge "Fix a use-of-uninitialized-value warning."
George Burgess IV [Wed, 25 Jan 2017 20:09:26 +0000 (20:09 +0000)]
Merge "Fix a use-of-uninitialized-value warning."
am: 500cf67206

Change-Id: I8b171a90696e09c42a1506255bc4c0056f69f35c

7 years agozygote: don't drop CAP_SYS_PTRACE from the bounding set.
Josh Gao [Wed, 25 Jan 2017 19:45:58 +0000 (11:45 -0800)]
zygote: don't drop CAP_SYS_PTRACE from the bounding set.

crash_dump needs to acquire CAP_SYS_PTRACE to be able to ptrace
processes with capabilities. selinux should hopefully be sufficient for
restricting ptrace to processes that should do it.

Bug: http://b/34694637
Test: debuggerd `pidof system_server`
Change-Id: If46f0b9baa54529780f7767f309f76b102a42ab4

7 years agoMerge "Fix a use-of-uninitialized-value warning."
Treehugger Robot [Wed, 25 Jan 2017 20:01:33 +0000 (20:01 +0000)]
Merge "Fix a use-of-uninitialized-value warning."

7 years agoMerge "nfc: Make NDEF validation stricter"
Ruchi Kandoi [Wed, 25 Jan 2017 19:59:16 +0000 (19:59 +0000)]
Merge "nfc: Make NDEF validation stricter"
am: f3a6269fed

Change-Id: If69e586c81e5926c0795af3689de67b260891eaa

7 years agoMerge "nfc: Make NDEF validation stricter"
Treehugger Robot [Wed, 25 Jan 2017 19:53:59 +0000 (19:53 +0000)]
Merge "nfc: Make NDEF validation stricter"

7 years agonfc: Make NDEF validation stricter
Ruchi Kandoi [Wed, 25 Jan 2017 02:32:01 +0000 (18:32 -0800)]
nfc: Make NDEF validation stricter

- Check if the MB is not set for any record apart from the first one.
- If the record is chunked, first record must contain the type

Bug: 20722275
Test: Manual; write raw NDEF messages to a tag
Change-Id: I3e73fc5163bbcd8a1f23417e98f57b665f4f1fad
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
7 years agoMerge "Bluetooth: fix indentation, formatting in dumpsys"
Andre Eisenbach [Wed, 25 Jan 2017 18:16:27 +0000 (18:16 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys"
am: 35c715332f

Change-Id: I7c603ab9f50921afb45e3d7181541260d8939089

7 years agoMerge "Bluetooth: fix indentation, formatting in dumpsys"
Andre Eisenbach [Wed, 25 Jan 2017 18:05:10 +0000 (18:05 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys"

7 years agoBluetooth: fix indentation, formatting in dumpsys
Marie Janssen [Wed, 18 Jan 2017 17:37:52 +0000 (09:37 -0800)]
Bluetooth: fix indentation, formatting in dumpsys

Before
======
Enable log:
01-17 09:43:18   Enabled  by com.android.systemui
01-18 07:13:10  Disabled  by com.andorid.systemui

1 BLE Apps registered:
com.google.android.gms

After
=====
Enable log:
  02-06 07:49:07   Enabled  by system boot
  02-06 07:49:35  Disabled  by com.andorid.systemui

1 BLE App registered:
  com.google.android.gms

Test: run bugreport, see differences in dumpsys
Change-Id: I6086f7f97c1fcbdb860d70d9516fd5bf630a9f5e

7 years agoMerge "API: Update Collections to OpenJDK8u60"
Tobias Thierer [Wed, 25 Jan 2017 11:35:11 +0000 (11:35 +0000)]
Merge "API: Update Collections to OpenJDK8u60"
am: 815fb54798

Change-Id: I97f0155ed743c7bc674f0241b2b07955e8d68e56

7 years agoMerge "API: Update Collections to OpenJDK8u60"
Tobias Thierer [Wed, 25 Jan 2017 11:29:42 +0000 (11:29 +0000)]
Merge "API: Update Collections to OpenJDK8u60"

7 years agoMerge "hotspot2: add support for complete PerProviderSubscription/Credential subtree"
Peter Qiu [Wed, 25 Jan 2017 03:17:19 +0000 (03:17 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree"
am: 123aa5d8b1

Change-Id: If8164839812728361fcd3d9b2f37c481ccf9b33c

7 years agoMerge "hotspot2: add support for complete PerProviderSubscription/Credential subtree"
Treehugger Robot [Wed, 25 Jan 2017 03:09:08 +0000 (03:09 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree"

7 years agoMerge "hotspot2: add support for complete HomeSP subtree"
Peter Qiu [Wed, 25 Jan 2017 02:11:10 +0000 (02:11 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree"
am: 28c7afe578

Change-Id: If1b097fb5b9453d1e108534c1fb088dfc92b1b6e

7 years agoMerge "hotspot2: add support for complete HomeSP subtree"
Treehugger Robot [Wed, 25 Jan 2017 02:02:58 +0000 (02:02 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree"

7 years agohotspot2: add support for complete PerProviderSubscription/Credential subtree
Peter Qiu [Wed, 11 Jan 2017 21:39:35 +0000 (13:39 -0800)]
hotspot2: add support for complete PerProviderSubscription/Credential subtree

Added missing fields in Credential subtree for supporting Release 2
and added parsing support for the new fields.

Bug: 34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: Ic3665c963ab77ddc4b9a03262517a3c7a4ec3ffc

7 years agohotspot2: add support for complete HomeSP subtree
Peter Qiu [Wed, 11 Jan 2017 19:01:02 +0000 (11:01 -0800)]
hotspot2: add support for complete HomeSP subtree

Added missing fields in HomeSP subtree for supporting Release 2
and added parsing support for the new fields.

Bug: 34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: Id2766b6b48be8bd97b56eb7c57a0e8527f38e06c

7 years agoFix a use-of-uninitialized-value warning.
George Burgess IV [Tue, 24 Jan 2017 23:48:28 +0000 (15:48 -0800)]
Fix a use-of-uninitialized-value warning.

Caught by clang's static analyzer:
frameworks/base/core/jni/android_hardware_SoundTrigger.cpp:660:20:
warning: Assigned value is garbage or undefined
        nHandle[0] = (jint)handle;

Given that we return an error code anyway, we can just set it to 0 and
move on.

Bug: None
Test: Still builds; static analyzer doesn't complain.
Change-Id: I9a5be562a0d96fd6c48bb98eca0867fc754bba63

7 years agoMerge "unbindBackupAgent and initialize inFullBackup"
Chris Tate [Tue, 24 Jan 2017 23:38:12 +0000 (23:38 +0000)]
Merge "unbindBackupAgent and initialize inFullBackup"
am: 36654ffef5

Change-Id: I5ba75075e2fb2dae0dcabbb0cee3b83c3d0c15ea

7 years agoMerge "unbindBackupAgent and initialize inFullBackup"
Chris Tate [Tue, 24 Jan 2017 23:31:34 +0000 (23:31 +0000)]
Merge "unbindBackupAgent and initialize inFullBackup"

7 years agoMerge "Vodafone SIMs should treat Spain as roaming"
Torbjorn Eklund [Tue, 24 Jan 2017 22:49:27 +0000 (22:49 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming"
am: a9c27b348c

Change-Id: Ia57e460220a5f8e53f47f2454f5c1a005830a3e6

7 years agoMerge "Vodafone SIMs should treat Spain as roaming"
Treehugger Robot [Tue, 24 Jan 2017 22:43:31 +0000 (22:43 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming"

7 years agoMerge "Change HFP Client API to support multi device"
Sanket Agarwal [Tue, 24 Jan 2017 19:06:40 +0000 (19:06 +0000)]
Merge "Change HFP Client API to support multi device"
am: 01f2e67648

Change-Id: I887b83939581fe1fd4068f7a4a72a6910c994c74

7 years agoMerge "Change HFP Client API to support multi device"
Sanket Agarwal [Tue, 24 Jan 2017 19:01:13 +0000 (19:01 +0000)]
Merge "Change HFP Client API to support multi device"

7 years agoMerge "Prepare for removal of legacy-test from default targets (Part 2)"
Paul Duffin [Tue, 24 Jan 2017 16:08:26 +0000 (16:08 +0000)]
Merge "Prepare for removal of legacy-test from default targets (Part 2)"
am: 5a3a3d298a

Change-Id: I14fd4502454a98baf01f5ace83fe0c583005a52d

7 years agoMerge "Prepare for removal of legacy-test from default targets (Part 2)"
Paul Duffin [Tue, 24 Jan 2017 16:01:59 +0000 (16:01 +0000)]
Merge "Prepare for removal of legacy-test from default targets (Part 2)"

7 years agoPrepare for removal of legacy-test from default targets (Part 2)
Paul Duffin [Tue, 24 Jan 2017 14:28:20 +0000 (14:28 +0000)]
Prepare for removal of legacy-test from default targets (Part 2)

In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.

Bug: 30188076
Test: make checkbuild
Merged-In: If507b641624a2933e722f61e815890fcdf442265
Change-Id: Icdcad50f1cc32e900bc9e882f1db2867ea170fbf

7 years agoAPI: Update Collections to OpenJDK8u60
Tobias Thierer [Fri, 2 Sep 2016 14:04:54 +0000 (15:04 +0100)]
API: Update Collections to OpenJDK8u60

Bug: 29935305
Bug: 31896176
Test: make update-api
Change-Id: I94f0f8c6915fdc1c8151b816d0a988a07629e984

7 years agoMerge "Expose more ICU4J APIs."
Joachim Sauer [Tue, 24 Jan 2017 12:35:30 +0000 (12:35 +0000)]
Merge "Expose more ICU4J APIs."
am: e5f0221f06

Change-Id: I77e300979bdfe781ad9ab7aff5241b92491e5660

7 years agoMerge "Expose more ICU4J APIs."
Joachim Sauer [Tue, 24 Jan 2017 12:30:11 +0000 (12:30 +0000)]
Merge "Expose more ICU4J APIs."

7 years agoMerge "All upstream mobile connection management is now in UpstreamNetworkMonitor"
Erik Kline [Tue, 24 Jan 2017 08:00:48 +0000 (08:00 +0000)]
Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor"
am: c1987487a2

Change-Id: I2b7e0f63c8198c8fde52396f989c16d795e612a8

7 years agoMerge "All upstream mobile connection management is now in UpstreamNetworkMonitor"
Treehugger Robot [Tue, 24 Jan 2017 07:54:20 +0000 (07:54 +0000)]
Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor"

7 years agoAll upstream mobile connection management is now in UpstreamNetworkMonitor
Erik Kline [Mon, 23 Jan 2017 07:42:01 +0000 (16:42 +0900)]
All upstream mobile connection management is now in UpstreamNetworkMonitor

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131

Change-Id: Ifbd430d5bf2d2191469c9810ad8f073506abde46

7 years agoMerge "support suw and post-suw cases for default app"
Chen Xu [Tue, 24 Jan 2017 02:39:55 +0000 (02:39 +0000)]
Merge "support suw and post-suw cases for default app"
am: 9fc8d99c76

Change-Id: I7a451bf2cfdfd6db65208a46db9d664039297ace

7 years agoMerge "support suw and post-suw cases for default app"
Chen Xu [Tue, 24 Jan 2017 02:30:58 +0000 (02:30 +0000)]
Merge "support suw and post-suw cases for default app"

7 years agosupport suw and post-suw cases for default app
fionaxu [Mon, 23 Jan 2017 06:43:41 +0000 (22:43 -0800)]
support suw and post-suw cases for default app

- our default carrier actions might not compatible with suw since data might be disabled
without surfacing users with an option to activate inside SuW.
- instead, skip carrier actions during setupwizard and schedule a job to resume carrier actions if needed when exit suw.
- use jobscheduler to monitor provision bit instead of keep the app running and listen for content change asynchronously.

Bug: 30958215
Test: Manual

Change-Id: Ie4004b46405b914158f585059d332f4e694053f3

7 years agoMerge "Mark the INetworkScoreCache as oneway."
Jeremy Joslin [Mon, 23 Jan 2017 21:31:21 +0000 (21:31 +0000)]
Merge "Mark the INetworkScoreCache as oneway."
am: edadb3efc3

Change-Id: I3b71e154f49b354ead2bf734da4a94e332f87a33

7 years agoMerge "Mark the INetworkScoreCache as oneway."
Treehugger Robot [Mon, 23 Jan 2017 21:22:10 +0000 (21:22 +0000)]
Merge "Mark the INetworkScoreCache as oneway."

7 years agoMerge "Deprecate old TelecomManager actions"
Brad Ebinger [Mon, 23 Jan 2017 19:23:35 +0000 (19:23 +0000)]
Merge "Deprecate old TelecomManager actions"
am: d1ab15a1af

Change-Id: Id76db43d6cc4477a328698e049558ef936a4fe1d

7 years agoMerge "Deprecate old TelecomManager actions"
Brad Ebinger [Mon, 23 Jan 2017 19:09:11 +0000 (19:09 +0000)]
Merge "Deprecate old TelecomManager actions"

7 years agoMark the INetworkScoreCache as oneway.
Jeremy Joslin [Mon, 23 Jan 2017 18:51:41 +0000 (10:51 -0800)]
Mark the INetworkScoreCache as oneway.

Test: built & run
Bug: 34522097
Change-Id: I7d2075febe6c3cdc24b56df255f8ba59e13322bf

7 years agoMerge "LocalDisplayAdapter: don't crash when no color modes available"
thecrazyskull [Mon, 23 Jan 2017 17:35:11 +0000 (17:35 +0000)]
Merge "LocalDisplayAdapter: don't crash when no color modes available"
am: 24218db904

Change-Id: I89d080a00fb87c73c2af1604f617706f0f60f32b

7 years agoMerge "LocalDisplayAdapter: don't crash when no color modes available"
Treehugger Robot [Mon, 23 Jan 2017 17:25:10 +0000 (17:25 +0000)]
Merge "LocalDisplayAdapter: don't crash when no color modes available"

7 years agoMerge "Make TelephonyManager#get/setAllowedCarriers system api"
Polina Bondarenko [Mon, 23 Jan 2017 17:10:05 +0000 (17:10 +0000)]
Merge "Make TelephonyManager#get/setAllowedCarriers system api"
am: 6d064d8780

Change-Id: I8f9b1c8e9ce1fda6cd03cd0dd459ead8837bd90d

7 years agoMerge "Make TelephonyManager#get/setAllowedCarriers system api"
Treehugger Robot [Mon, 23 Jan 2017 17:01:24 +0000 (17:01 +0000)]
Merge "Make TelephonyManager#get/setAllowedCarriers system api"

7 years agoMerge "Disable always-on VPN in factoryReset"
Robin Lee [Mon, 23 Jan 2017 16:47:58 +0000 (16:47 +0000)]
Merge "Disable always-on VPN in factoryReset"
am: 63c14e0ab6

Change-Id: I021b288e3db17ddefbea3645fd282e3ee123a6e8

7 years agoMerge "Disable always-on VPN in factoryReset"
Robin Lee [Mon, 23 Jan 2017 16:40:05 +0000 (16:40 +0000)]
Merge "Disable always-on VPN in factoryReset"

7 years agoLocalDisplayAdapter: don't crash when no color modes available
thecrazyskull [Sun, 18 Dec 2016 17:48:20 +0000 (12:48 -0500)]
LocalDisplayAdapter: don't crash when no color modes available

Test: none

Change-Id: Ic11b5b66864fdd97b290722cba534b2aa38ac054

7 years agoMerge "Move TetheringConfiguration out to its own file"
Erik Kline [Mon, 23 Jan 2017 12:20:35 +0000 (12:20 +0000)]
Merge "Move TetheringConfiguration out to its own file"
am: 5a45170f95  -s ours

Change-Id: I6a6bc4b2679432dd539d6b6930d7a32229fab363

7 years agoMove TetheringConfiguration out to its own file
Erik Kline [Sat, 21 Jan 2017 05:33:56 +0000 (14:33 +0900)]
Move TetheringConfiguration out to its own file

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net
    - vanilla tethering works
        - changing from no dun requirement to dun shows dun required
Bug: 32163131

Change-Id: I488449570dff057311b37335923ce6a199b363b7

7 years agoMerge "Move TetheringConfiguration out to its own file"
Erik Kline [Mon, 23 Jan 2017 10:56:35 +0000 (10:56 +0000)]
Merge "Move TetheringConfiguration out to its own file"

7 years agoMove TetheringConfiguration out to its own file
Erik Kline [Sat, 21 Jan 2017 05:33:56 +0000 (14:33 +0900)]
Move TetheringConfiguration out to its own file

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net
    - vanilla tethering works
        - changing from no dun requirement to dun shows dun required
Bug: 32163131

Change-Id: I488449570dff057311b37335923ce6a199b363b7

7 years agoMerge "Add test for updateMobileRequiresDun()"
Erik Kline [Mon, 23 Jan 2017 10:53:11 +0000 (10:53 +0000)]
Merge "Add test for updateMobileRequiresDun()"
am: 7f018500dc

Change-Id: Ic7b984105e2c245a992446e15d11dd19e4671a57

7 years agoMerge "Add test for updateMobileRequiresDun()"
Treehugger Robot [Mon, 23 Jan 2017 10:44:19 +0000 (10:44 +0000)]
Merge "Add test for updateMobileRequiresDun()"

7 years agoAdd test for updateMobileRequiresDun()
Erik Kline [Mon, 23 Jan 2017 06:55:16 +0000 (15:55 +0900)]
Add test for updateMobileRequiresDun()

This test validates that when a mobile upstream has been requested
changing the "DUN required" state results in updating the requested
network appropriately.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-test passes
Bug: 32163131

Change-Id: Ia3a1f6493ea348eb75e334344468a980206f618f

7 years agoMerge "More concisely export whether we have a "tetherable configuration""
Erik Kline [Mon, 23 Jan 2017 07:13:56 +0000 (07:13 +0000)]
Merge "More concisely export whether we have a "tetherable configuration""
am: 1b2a1b911d

Change-Id: I5f9717c9dab6b39f1fbf2186107b2a1f3f2d4f8f

7 years agoMerge "More concisely export whether we have a "tetherable configuration""
Treehugger Robot [Mon, 23 Jan 2017 07:04:21 +0000 (07:04 +0000)]
Merge "More concisely export whether we have a "tetherable configuration""

7 years agoMore concisely export whether we have a "tetherable configuration"
Erik Kline [Mon, 23 Jan 2017 04:01:58 +0000 (13:01 +0900)]
More concisely export whether we have a "tetherable configuration"

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - vanilla WiFi-to-mobile tethering works
Bug: 32163131
Change-Id: I20dd36b5bf7fc55a639c76ea4bdb55b650654881

7 years agoMerge "Add Setting for curating saved open networks."
Amin Shaikh [Sat, 21 Jan 2017 05:27:06 +0000 (05:27 +0000)]
Merge "Add Setting for curating saved open networks."
am: b3b665de22

Change-Id: I3c65f39dc4f38f1c6c00a240f519cb0b0cf1a916

7 years agoMerge "Add Setting for curating saved open networks."
Treehugger Robot [Sat, 21 Jan 2017 05:17:41 +0000 (05:17 +0000)]
Merge "Add Setting for curating saved open networks."

7 years agoMerge "Move several config elements into TetheringConfiguration class"
Erik Kline [Sat, 21 Jan 2017 04:57:34 +0000 (04:57 +0000)]
Merge "Move several config elements into TetheringConfiguration class"
am: 8d35276910

Change-Id: I0eb196a4b61e460db24271d6805177641ad3fc9b

7 years agoMove several config elements into TetheringConfiguration class
Erik Kline [Sat, 21 Jan 2017 04:57:29 +0000 (04:57 +0000)]
Move several config elements into TetheringConfiguration class
am: 3e7566572e

Change-Id: Ic053965b54eed0afc9a4785ce80ef1fab281493a

7 years agoMerge "Move several config elements into TetheringConfiguration class"
Erik Kline [Sat, 21 Jan 2017 04:49:10 +0000 (04:49 +0000)]
Merge "Move several config elements into TetheringConfiguration class"

7 years agoMerge "Address a few unittest comments."
Erik Kline [Sat, 21 Jan 2017 04:43:27 +0000 (04:43 +0000)]
Merge "Address a few unittest comments."
am: 9c3a298748

Change-Id: I2d41cdbe05653bcbed9d3b38b440c06b98006809