Commit Graph

285242 Commits

Author SHA1 Message Date
Hugo Benichi
bbddbfc451 Merge "Revert "Instrument captive portal login activity""
am: 2921320517

Change-Id: Iacae406a0998bb91c84b73a66ff383dfa8038665
2017-06-09 11:40:01 +00:00
Hugo Benichi
2921320517 Merge "Revert "Instrument captive portal login activity"" 2017-06-09 11:31:23 +00:00
Hugo Benichi
828512f14c Revert "Instrument captive portal login activity"
This reverts commit f867da14ea.

Change-Id: Ic900c91ed87c2d65c151f8386954bd7b74128348
2017-06-09 11:30:05 +00:00
Erik Kline
ad3fd82f8b Merge "Convert IControlsTethering from interface into callback"
am: 5b9d362b60

Change-Id: I911548e994761778cf5434b2513d433eeaccd4f3
2017-06-09 09:16:01 +00:00
Erik Kline
5b9d362b60 Merge "Convert IControlsTethering from interface into callback" 2017-06-09 09:06:41 +00:00
Hugo Benichi
30b7dfb526 Merge "Instrument captive portal login activity"
am: b213053def

Change-Id: Ic8205b609f8c6e0bc04eac17c3bcbe7df0508207
2017-06-09 06:50:52 +00:00
Hugo Benichi
75792d4299 Merge "New Metrics constants for captive portal related UI"
am: aac9aff5dc

Change-Id: Ib55742148a08ae21f01539939e41699cdb581ca2
2017-06-09 06:47:47 +00:00
Hugo Benichi
b213053def Merge "Instrument captive portal login activity" 2017-06-09 06:39:19 +00:00
Hugo Benichi
aac9aff5dc Merge "New Metrics constants for captive portal related UI" 2017-06-09 06:38:11 +00:00
Hugo Benichi
f867da14ea Instrument captive portal login activity
Also add CAPTIVE_PORTAL_LOGIN_ACTIVITY_SSL_ERROR constants to
metrics_constants.proto for counting ssl error pages shown by the
captive portal login activity.

Bug: 36203355
Bug: 34901696
Bug: 36532213
Test: manually tested with captive portal testing setup while watching
      event logs: adb logcat -b events | grep captiveportallogin
        06-08 16:25:20.279 21558 21558 I sysui_action: [1004,com.android.captiveportallogin]
        06-08 17:01:04.052 21558 21558 I sysui_action: [1007,com.android.captiveportallogin]

Merged-In: Ia05853506d424ad4cb2c11770ae7718fbef3f01c

(cherry picked from commit c61dc92fc0)

Change-Id: I9184f6263a003c2be28f41a550c6164c8d6ee907
2017-06-09 14:08:39 +09:00
Mathieu Chartier
187b15bbd5 Merge "Add system property for hot startup method threshold"
am: a370159592

Change-Id: I271cf74364b7b9c2d16282ef6a9ab24b6d243e1e
2017-06-08 21:54:22 +00:00
Mathieu Chartier
a370159592 Merge "Add system property for hot startup method threshold" 2017-06-08 21:44:08 +00:00
Jakub Pawlowski
c0fed83b84 Merge "Bluetooth: fix connectGatt overload invocations"
am: 404e9f209f

Change-Id: I01699795f733fbf46af10ba25afd8cb3feecc9ea
2017-06-08 21:12:26 +00:00
Jakub Pawlowski
404e9f209f Merge "Bluetooth: fix connectGatt overload invocations" 2017-06-08 20:59:35 +00:00
Jakub Pawlowski
ba1e26578e Bluetooth: fix connectGatt overload invocations
Test: sl4a GattOverBrEdrTest
Bug: 62387078
Change-Id: I5bfb87683e25f8862587e8000eb4c9bb6ff14f99
2017-06-08 17:54:29 +00:00
Jesse Hall
00c6c3be77 Merge "Allow disabling GL preload even if gfxdriver isn't updatable"
am: 9cf8c281d2

Change-Id: I025787589009c11bd5477777105b2a5ab2c5f592
2017-06-08 15:41:46 +00:00
Jesse Hall
9cf8c281d2 Merge "Allow disabling GL preload even if gfxdriver isn't updatable" 2017-06-08 15:34:44 +00:00
Erik Kline
ab6439b0f8 Convert IControlsTethering from interface into callback
Additionally:
    - add updateLinkProperties() method to new callback
    - skeletally connect LinkProperties updates through
      to OffloadController

TODOs liberally sprinkled through out.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 32163131
Change-Id: I631d17b26be153534551a1615931fc98b598b953
2017-06-08 22:28:57 +09:00
Erik Kline
8bc87070f9 Merge "Move findPreferredUpstreamType into UNM"
am: 32703994fe

Change-Id: I20e90906e72bc8bba9f0f535d54ba430f96191ff
2017-06-08 12:11:59 +00:00
Treehugger Robot
32703994fe Merge "Move findPreferredUpstreamType into UNM" 2017-06-08 12:03:02 +00:00
Erik Kline
a1d368af2f Move findPreferredUpstreamType into UNM
This changes the way in which available networks are found. Previously
Tethering asked ConnectivityService for NetworkInfo and checked for
whether or not it was in state CONNECTED.

Here we use the fact that ConnectivityService will not call UNM's
callbacks' onAvailable() methods until the networks in question have
become connected.

Test: as follows
    - built
    - flashed
    - booted
    - runtest framework-net passed
Bug: 32163131

Change-Id: I97abe225fdd3accb38bd9168f545445b761a90d8
2017-06-08 16:50:17 +09:00
Andreas Gampe
3ea0309e39 Merge "Framework: Remove SamplingProfiler"
am: d2ecee2506

Change-Id: Iccba75c67041593131bec64e518a1bd968cb1bb0
2017-06-08 03:16:54 +00:00
Treehugger Robot
d2ecee2506 Merge "Framework: Remove SamplingProfiler" 2017-06-08 03:05:59 +00:00
Mathieu Chartier
42cd265639 Add system property for hot startup method threshold
The property is dalvik.vm.hot-startup-method-samples, setting this
controls how many startup samples are required before methods are
marked as hot in the profile.

Test: adb shell setprop dalvik.vm.hot-startup-method-samples 12
Test: adb shell setprop dalvik.vm.extra-opts -verbose:profiler
Test: adb logcat | grep Profile

Bug: 36457259

(cherry picked from commit 5eee004b92)

Change-Id: Ibf8075aafc6e5bd2ba10385973b26faee3d807df
2017-06-07 18:33:48 -07:00
Hall Liu
a807ee8f1c Merge "Embms download setup"
am: da5b77fa9b

Change-Id: I18b378fd0c999e40e3dc8cf9d1248414489880c6
2017-06-08 01:26:28 +00:00
Hall Liu
da5b77fa9b Merge "Embms download setup" 2017-06-08 01:20:49 +00:00
Hall Liu
0842831e23 Embms download setup
Add MbmsDownloadReceiver and MbmsTempFileProvider to facilitate MBMS
download.
Fill in the download method in MbmsDownloadManager

Test: testapps
Change-Id: Ibb30f3b2b9d14b9df6b53c06916c21e3ca3a42c6
2017-06-07 13:58:18 -07:00
Andreas Gampe
5085ef71e9 Framework: Remove SamplingProfiler
Remove the very old and unsupported SamplingProfilerIntegration. This
CL removes the code parts.

Bug: 37272346
Test: m
Test: Device boots
Merged-In: I64d77244b5816ef1f605d19530b96be38f5c1bc6
Change-Id: I64d77244b5816ef1f605d19530b96be38f5c1bc6
2017-06-07 11:26:15 -07:00
Erik Kline
35182218d3 Merge "Add additional mocking for Context innards"
am: a65aa77c1c

Change-Id: I7f780c05c46b00457b194bfb13df5814735f0809
2017-06-07 09:40:37 +00:00
Treehugger Robot
a65aa77c1c Merge "Add additional mocking for Context innards" 2017-06-07 09:32:04 +00:00
Erik Kline
ec37275ec9 Add additional mocking for Context innards
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - cherry-picked to master and verified there as well
Bug: 32163131
Bug: 32561414

Change-Id: I0b5b1b12d55547d08c332c7d274f19f0023a7b07
2017-06-07 17:44:53 +09:00
Hugo Benichi
93fe99aca4 Merge "Captive portal login shows specific network name"
am: 01fb05cf62

Change-Id: I205b37d204250d7fc188b2d7d23593d22d03b89d
2017-06-07 08:35:51 +00:00
Hugo Benichi
01fb05cf62 Merge "Captive portal login shows specific network name" 2017-06-07 08:11:22 +00:00
Hugo Benichi
3a222974e9 Captive portal login shows specific network name
Bug: 62274222
Bug: 38197949
Bug: 36532213
Test: manually tested by triggering the captive portal login activity
Change-Id: I31439b13a87a78982560828f9ea8a3a57591471b
2017-06-07 12:35:49 +09:00
Hugo Benichi
24912bb93d Merge "Revert "Captive portal login shows specific network name""
am: 7f423d00dd

Change-Id: I0d77f19cadbf5905215ae576e66057a259f2348e
2017-06-07 03:32:09 +00:00
Hugo Benichi
7f423d00dd Merge "Revert "Captive portal login shows specific network name"" 2017-06-07 03:23:18 +00:00
Hugo Benichi
ef0884f2e5 Revert "Captive portal login shows specific network name"
This reverts commit 8032ff32ff.

Several branches are broken because of this.

Change-Id: I2d9f8b1cc8f93ed8de7d1e01d49c7cd29417820d
2017-06-07 03:22:20 +00:00
Hugo Benichi
d4cb33b83f Merge "Captive portal login shows specific network name"
am: ea7322d17e

Change-Id: I48abfa9523854ea3f30883e92d6d3011d41c6a66
2017-06-07 02:42:36 +00:00
Hugo Benichi
ea7322d17e Merge "Captive portal login shows specific network name" 2017-06-07 02:33:04 +00:00
Gabriele M
a8e8f1c9f6 Merge "QS: Remove listeners only if added"
am: bede96729c

Change-Id: I53250273e39889b6b772dc12bbdbbc0c9606fd47
2017-06-06 18:49:15 +00:00
Jesse Hall
f20fdb9320 Allow disabling GL preload even if gfxdriver isn't updatable
Bug: 34611670
Test: set ro.zygote.disable_gl_preload=1, shell start,
      confirm GL driver isn't loaded in zygote process
      by checking /proc/<pid>/maps

Change-Id: Ieb739bd7eba365917684cf830d78c15fea06f8cf
(cherry picked from commit 5d911fe6bb)
2017-06-06 11:41:46 -07:00
Treehugger Robot
bede96729c Merge "QS: Remove listeners only if added" 2017-06-06 18:36:27 +00:00
Gabriele M
6feb3a1c87 QS: Remove listeners only if added
handleDestroy() calls setListening(false) unconditionally. This
causes an error if no listener was never added. Check if we added
a listener and then try to remove it.

Change-Id: Iefe8aacbe87ba1c2c19c9e77cf132fc7c84798f9
2017-06-06 18:42:17 +02:00
Paul Duffin
de30ee2d40 Merge "Added android.test.mock and android.test.mock.sdk targets"
am: 46f8d427c4

Change-Id: I93ecb5e95337b84c2746b802fa88382cdd676cb8
2017-06-06 07:49:39 +00:00
Paul Duffin
46f8d427c4 Merge "Added android.test.mock and android.test.mock.sdk targets" 2017-06-06 07:40:19 +00:00
Erik Kline
4e5024131b Merge "Support setting upstream parameters."
am: faf8d67749

Change-Id: I0be9ad265fa664f0ce6e1e098996b46c88317b97
2017-06-06 04:54:04 +00:00
Treehugger Robot
faf8d67749 Merge "Support setting upstream parameters." 2017-06-06 04:43:35 +00:00
Erik Kline
7990aef63b Support setting upstream parameters.
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 32163131
Bug: 34361337
Change-Id: Id88cae4beed7d38aec3d29a0e2f59a5c7e6a9a4e
2017-06-06 12:02:13 +09:00
Paul Duffin
4823935a84 Added android.test.mock and android.test.mock.sdk targets
The android.test.mock will be used for any targets that require
android.test.mock classes but which do not already depend on the
sdk. It is also the library that will be added to the classpath
at runtime when an app has the following in their manifest.
    <uses-library android:name="android.test.mock"/>

The android.test.mock.sdk will be used by targets that require
android.test.mock classes and which build against the SDK. It
contains stub classes (like android.jar). It is also the library
that will be copied into the optional directory of the SDK.

(cherry picked from f74752293d)

Bug: 30188076
Test: make checkbuild
Change-Id: If199180e1136da1927a9e7c7bcafbcfb29cf1274
Merged-In: Ia3fcd47c644b8e5a573f891571a7b3772eac63f9
2017-06-05 13:49:50 +01:00
Hugo Benichi
8032ff32ff Captive portal login shows specific network name
Bug: 62274222
Bug: 38197949
Bug: 36532213
Test: manually tested by triggering the captive portal login activity
Change-Id: If10448dce5db0fc3c46cedba58abda26e30e2507
2017-06-05 15:14:31 +09:00