Commit Graph

284907 Commits

Author SHA1 Message Date
Hugo Benichi
5153e2f608 New Metrics constants for captive portal related UI
This patch adds 5 new constants in metrics_constants for counting
various UI interactions involving captive portals:
  - sign-in button in wifi network details card
  - captive portal login activity start up
  - captive portal login activity menu interactions (2 constants)
  - captive portal login activity auto-closes on portal dismissed

Bug: 34901696
Bug: 26303355
Test: compiled, flashed
Merged-In: I489e5f2f8ff27da60fed215fa5f51326933fd79e

(cherry pick from commit 11da42bbb6)

Change-Id: Ifc553b08a65e78a630e235de087b7659a228bec8
2017-06-05 13:41:20 +09:00
Treehugger Robot
12fe022fbd Merge "Minor upstream selection refactoring" 2017-06-05 04:19:30 +00:00
Treehugger Robot
42409f9776 Merge "Fix captive portal login ssl error overflow" 2017-06-05 03:48:00 +00:00
Erik Kline
93c4afae07 Minor upstream selection refactoring
Specifically:
    - relocated "tryCell" handling
    - minor logging change
    - remove unneeded checkExpectedThread()

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131
Change-Id: I2f5428206503fd222b959e695c26326df53038f1
2017-06-05 11:20:49 +09:00
Hugo Benichi
60d5f46d89 Fix captive portal login ssl error overflow
This patch fixes the built-in html page shown in the captive portal
login activity when there is an ssl error. The page is now scaled
correctly with respect to the device screen, and text wraps as
expected.

This patch also cleanups the hardcoded page by:
 - formatting it for better reading,
 - inlining the "px" css rules,
 - using string concatenation instead of format for including the
   localized text.

Bug: 62269512
Bug: 36532213
Test: manually triggered the activity to load the error page
Change-Id: I9d037222798bd9d4c1736923afb71e3e14c68bcc
2017-06-05 11:13:06 +09:00
nharold
4f6ec3d11d Merge "Add UDP Encap Socket Support to IpSecManager" 2017-06-02 23:40:18 +00:00
Brad Ebinger
75b7ef15f6 Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause" 2017-06-02 22:09:49 +00:00
Brad Ebinger
df0a75fa74 Adds ACCESS_CLASS_BLOCKED Disconnect cause
Adds the ACCESS_CLASS_BLOCKED Disconnect cause in order
to allow the dialer to take action when this happens
during a VT call.

Bug: 33821263
Test: Build
Change-Id: I9afdd90f0a8a562b626b730dbb1b03cf37776ebd
2017-06-02 13:20:35 -07:00
Treehugger Robot
7466567d89 Merge "Testra RSSI compliance" 2017-06-02 17:20:32 +00:00
Treehugger Robot
542ebcd3fb Merge "Testra RSSI compliance" 2017-06-02 17:16:42 +00:00
Sooraj Sasindran
e165a59c61 Testra RSSI compliance
Devices that support 4 bar signal strength
indication should display the bars as follow:

4 bar   RSRP   > -90
3 bar   -90 ≥    RSRP   > -100
2 bar  -100 ≥   RSRP   > -115
1 bar   -115 ≥  RSRP   > -120
0 bar   RSRP    ≤ -120
      or No Sync to LTE Reference Signals

Bug=37187586

Change-Id: I2a76aabdf6d8ef1be3a05a90643b1e670f929bc3
2017-06-01 22:50:14 -07:00
Sooraj Sasindran
641fbc1407 Testra RSSI compliance
Devices that support 4 bar signal strength
indication should display the bars as follow:

4 bar   RSRP   > -90
3 bar   -90 ≥    RSRP   > -100
2 bar  -100 ≥   RSRP   > -115
1 bar   -115 ≥  RSRP   > -120
0 bar   RSRP    ≤ -120
      or No Sync to LTE Reference Signals

Add support for mnc 11, 71 and 72

BUG=37187586

Change-Id: Ia0a71707d1cbc20887bcc00c0519833b522b4a95
2017-06-01 22:44:32 -07:00
Treehugger Robot
3478ff8c9e Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode" 2017-06-02 05:19:33 +00:00
Erik Kline
2efb827f61 Handle Wi-Fi passing explicit interface name and AP/IP mode
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 31466854
Bug: 32163131
Bug: 62076211
Change-Id: I3557a9c14f4e9f1de1869084566a179003d98ffe
2017-06-02 12:21:15 +09:00
Nathan Harold
8dc1fd0237 Add UDP Encap Socket Support to IpSecManager
-Implement the UdpEncapsulationSocket
-Convert all ManagedResources to use resourceIds
-Rework ManagedResource to track resourceIds

Bug: 30984788
Test: cts - IpSecManagerTest#testUdpEncapsulation()

Change-Id: I7b1099c487051a8d951c1485791c4b6cef2deb1d
2017-06-02 03:18:56 +00:00
Treehugger Robot
dae92faa02 Merge "WifiManager: add unspecified ip mode" 2017-06-02 01:26:16 +00:00
Treehugger Robot
d7287c96eb Merge "Optimised hwui rounded corners shader" 2017-06-01 23:13:26 +00:00
Arun
06e9f324ef Optimised hwui rounded corners shader
This is a ~2x performance increase for the rounded corners shader which
was previously shader limited even on many high-end GPUs. It simplifies
the calculations by pre-dividing by the radius, which also allows to
maintain mediump/FP16 precision (this improves performance and might
improve image quality on GPUs that don't support highp e.g. Mali-400).
It also uses a conditional in the shader to save much of the work on
the vast majority of pixels which are not close to the corners.

Test: manual - visual inspection on fugu (nexus player)

Change-Id: I38f491cfb006e2991ef0b9d6b3d67d2c4d328d44
2017-06-01 13:42:12 -07:00
Robert Greenwalt
142a392b75 Merge "Move appName inside Downloadrequest." 2017-06-01 16:52:34 +00:00
Treehugger Robot
5dbdffbf81 Merge "Prettify the captive portal sign-in activity" 2017-06-01 13:34:16 +00:00
Rebecca Silberstein
1da003621c WifiManager: add unspecified ip mode
Add an unspecified IP mode that allows WifiServiceImpl to clear state
in the interface-based IP mode tracking.

Bug: 31466854
Test: frameworks/base/wifi/tests/runtests.sh
Merged-In: I0d1db7ecb9cf7edd74d95f73d88b23571b87a27f
Merged-In: Iaa1474bd24d63e957ae82745b66c7571a5f18433
Change-Id: I15485cdab95ed4308cf5c2877fba40eac82bf162
(cherry picked from commit bf47543618)
2017-06-01 21:18:14 +09:00
Hugo Benichi
847737f090 Prettify the captive portal sign-in activity
- fuses url bar with activity header: url is now the subtitle
- url appears as text and not as editable content
- url only shows host name
- header style is the device default for Settings
- Material progress bar
- progress bar disappears at page load finished
- webview does not jump at page load finished

Bug: 62107381
Bug: 38197949
Test: tested by manually triggering the sign-in activity
Merged-In: Id75023acad04f444dbfc41de56814a09e70cc6f9

(cherry pick from commit a206649a6f)

Change-Id: I5c3e5ebac18fef6611c215d04d88ffef67b2b640
2017-06-01 18:36:08 +09:00
Yohann Roussel
f547c4045f Merge "Add tests on MultiDex.installInstrumentation" 2017-06-01 09:23:16 +00:00
Treehugger Robot
7cf3086f37 Merge "Add a tethering offload settings kill switch" 2017-06-01 07:50:35 +00:00
Treehugger Robot
93d7c84726 Merge "HFP: Allow SCO audio to be forcibly connected" 2017-06-01 06:53:27 +00:00
Robert Greenwalt
4b88cf4502 Move appName inside Downloadrequest.
Simplifies vendor API.

Test: builds
Change-Id: I1e59e8014aa0fe1c0d46bca3347f428347fa0365
2017-05-31 16:13:36 -07:00
Jack He
1dd1e03f1f HFP: Allow SCO audio to be forcibly connected
* Normally, Android only allows SCO audio to be connected in several
  allowed cases (e.g. in call, in ringing, in virtual call state, etc)
* Sometimes, it is necessary to force a SCO audio connection (e.g.
  during PTS test)
* This change adds setForceScoAudio(boolean) hidden, system only method
  to allow such behaviour

Bug: 38040125
Test: PTS HFP tests
Change-Id: I28f295c98da5bebb837c2a5423c7acde81af73f7
2017-05-31 15:41:30 -07:00
Treehugger Robot
36fdb346f2 Merge "Added video calling data usage per-uid support" 2017-05-31 21:33:57 +00:00
Jack Yu
a14e8bde2c Added video calling data usage per-uid support
Now the VT call data usage will be counted under
current dialer's data usage as well as the total
device data usage.

Test: Manual
bug: 37671326

Merged-In: I8351e9ae17c84210f7ca6c319d3bddcbb0043341
Change-Id: I8351e9ae17c84210f7ca6c319d3bddcbb0043341
2017-05-31 12:37:24 -07:00
Treehugger Robot
f2383db747 Merge "Fix race condition in NsdManagerTest" 2017-05-31 12:56:57 +00:00
Treehugger Robot
30895c5e1e Merge "Fix TaskRecord wrong dump element firstActiveTime" 2017-05-31 12:25:39 +00:00
Narayan Kamath
d29f144836 Merge "jni: Track debuggerd API changes." 2017-05-31 11:55:50 +00:00
Treehugger Robot
41f23d645c Merge "AndroidRuntime: Add flag to support tombstoned aided stack dumps." 2017-05-31 11:42:28 +00:00
Erik Kline
92c4db04e5 Add a tethering offload settings kill switch
Check for tether_offload_disabled (defaulting to false if not present)
before starting the OffloadController.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 32163131
Bug: 34361337
Change-Id: Ifcc0eb1a41f09ad9e717c9252d2d55e69789669b
2017-05-31 20:33:05 +09:00
Narayan Kamath
a005ab2242 jni: Track debuggerd API changes.
android_os_Debug calls dump_backtrace_to_file_timeout which
now needs an additional argument that specifies the dump type.

Bug: 32064548
Test: make

Change-Id: Ic4047f4117fee0829d4cb8b1d47ad688b33001dc
2017-05-31 10:30:47 +01:00
Narayan Kamath
23941e5c22 AndroidRuntime: Add flag to support tombstoned aided stack dumps.
We introduce a new property dalvik.vm.stack-trace-dir that indicates
that we're using one trace file per dump. The runtime does not need
to know what the directory is, since it will communicate with
tombstoned in order to obtain a file descriptor to which it will write
its traces. In this change, we set the -Xtombstonedtraces flag whenever
dalvik.vm.stack-trace-dir is set.

Test: Manual
Bug: 32064548
Change-Id: I05984e91658250ad8379b821ca31649f13868580
2017-05-31 10:09:49 +01:00
Hugo Benichi
22143956cf Fix race condition in NsdManagerTest
NsdManagerTest relies on the lastMessage variable to assert the
connection of a client to the service. The asserts in test are done on a
different thread, although the variable was not qualified volatile,
which creates the chance to read a stale value. This patch fixes this
race by marking the variable volatile.

Bug: 32561414
Bug: 62044295
Test: NsdManagerTest works
Change-Id: I0bc2cd8059c6ff8b78a2dda0ba8d6bc7e13ef951
2017-05-31 15:35:54 +09:00
Treehugger Robot
76efbb30f5 Merge "ConnectivityServiceTest: more tweaks to testRequestBenchmark" 2017-05-31 03:43:39 +00:00
Hugo Benichi
02f8f9c830 ConnectivityServiceTest: more tweaks to testRequestBenchmark
Recent continuous testing runs indicates that commit 849b81b7 did not
completely fixed the issue with testRequestBenchmark.

This patch changes the name of the test to not include "test" and
removes @SmallTest annotation, which should do the job of @Ignore while
ConnectivityServiceTest still extends AndroidTestCase.

In addition timeouts are adjusted to take into account recent failures
observed.

This is the last pending action before turning on FrameworksNetTests on
presubmits.

Bug: 32561414
Test: no functional change
Change-Id: I56ef334e19e99e5a3483418330e5f0ccd6eb31bb
2017-05-31 10:23:42 +09:00
Treehugger Robot
a4982eb5dd Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals" 2017-05-31 01:13:06 +00:00
Treehugger Robot
cfc68b6661 Merge "Allow ManagedProvisioning to silently uninstall apps" 2017-05-30 22:21:13 +00:00
Treehugger Robot
e2fddf56a4 Merge "use FgThread.class instead of UiThread.class for lock object" 2017-05-30 21:35:12 +00:00
Colin Cross
0b81f9727f Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals
Instead of directly adding dependencies to full_classes_compiled_jar
and full_classes_jack, just use LOCAL_ADDITIONAL_DEPENDENCIES and
let the build system take care of where the dependencies are needed.

Test: builds
Change-Id: Ia3078fe0aa54b2d69821a9879cfe43414e1e9c4f
2017-05-30 10:57:34 -07:00
daqi
961e50e9a4 Fix TaskRecord wrong dump element firstActiveTime
[Cause of Defect]
Used wrong class field.

Test: manual - adb shell dumpsys activity a

Change-Id: I6f54e374709b6ae60f8adabd5c29a1f100941c42
Signed-off-by: daqi <daqi@xiaomi.com>
2017-05-30 15:37:23 +08:00
Erik Kline
6cdcba7b48 Merge "Support "dumpsys connectivity tethering"" 2017-05-29 08:33:10 +00:00
Joel Scherpelz
bf152b14c4 Merge "Support requesting and receiving wakeup events" 2017-05-29 03:28:02 +00:00
Erik Kline
ee363c4e9b Support "dumpsys connectivity tethering"
Also print current upstream interface in tethering dump output.

Test: as follows
    - build
    - flashed
    - booted
    - runtest frameworks-net passes
    - "dumpsys connectivity tethering" shows just tethering info
Bug: 32163131
Bug: 36504926
Bug: 36988090
Bug: 38152109
Bug: 38186915
Bug: 38218697
Change-Id: I7f185fd71946a032e7f815207016294892df135d
2017-05-29 11:51:28 +09:00
Joel Scherpelz
b369bf5d3a Support requesting and receiving wakeup events
Test: as follows
    - built
    - flashed
    - booted
    - ConnectivityServiceTest passes
Bug: 28806131

Change-Id: Ifc45260d5315479393da2c859ba4afed4e0e8c85
2017-05-29 11:19:16 +09:00
Erik Kline
39ce589f0b Merge "Minor improvement in logging in TetheringConfiguration" 2017-05-28 11:06:40 +00:00
Erik Kline
6bd7453206 Minor improvement in logging in TetheringConfiguration
Test: as follows
    - built
    - booted
    - flashed
    - runtest frameworks-net passes
    - dumpsys connectivity shows expected output
Bug: 32163131
Bug: 36504926
Bug: 36988090
Bug: 38152109
Bug: 38186915
Bug: 38218697
Change-Id: I4a2129d780dfec7bca693486a100ea3c78465430
2017-05-28 18:05:23 +09:00