Commit Graph

28627 Commits

Author SHA1 Message Date
The Android Automerger
6a688ca1ad Merge commit '88932754ffdcbffb3cb43e03991e5eb598c10458' into nyc-mr1-dev-plus-aosp
* commit '88932754ffdcbffb3cb43e03991e5eb598c10458':
  Captive portals: login activity probes like NetworkMonitor
  Logging improvements in CaptivePortalLoginActivity
  Captive portal systel log improvements
  Fix flaky IpPrefixTest.
  Removing bogus file added by mistake
  frameworks-test: adding missing @SmallTest
  Netd events: record connect() success/errno
  Add missing dependency.
  Show notification for always-on app VPN
2017-01-27 06:39:52 +00:00
Pavlin Radoslavov
798e1862bd Merge "Increase the character limit for "Use System Selection" message" am: a7ce460921
am: d0386d8c07

Change-Id: I34e41269fd5d47024e211daa4b5c48124e7db0a8
2017-01-26 23:46:49 +00:00
Pavlin Radoslavov
d0386d8c07 Merge "Increase the character limit for "Use System Selection" message"
am: a7ce460921

Change-Id: I3092241c8b1a6e458b3dc2a1332abbf0d19cf786
2017-01-26 23:41:39 +00:00
Pavlin Radoslavov
f8c776ce01 Increase the character limit for "Use System Selection" message
The character limit for message "Use System Selection (Default)"
has been increased from 40 to 50.

Test: UI visual inspection
Bug: 34662759
Change-Id: I9aba6847ddab27bb0456fb6dfd429692732f07c2
2017-01-26 13:37:14 -08:00
Pavlin Radoslavov
d364208388 Merge "Integration of the AAC codec for A2DP source" am: 22f97c83fb
am: f23e80bb9b

Change-Id: If2d85eba17f7ece5b3d19e3ee8fc86b7cf9bc062
2017-01-26 19:25:37 +00:00
Pavlin Radoslavov
f23e80bb9b Merge "Integration of the AAC codec for A2DP source"
am: 22f97c83fb

Change-Id: I22838db2b87f83a3832f78d74d08a6f988264284
2017-01-26 19:20:08 +00:00
Pavlin Radoslavov
b33bd5bc2e Integration of the AAC codec for A2DP source
Test: A2DP streaming to AAC headsets
Bug: 30958229
Change-Id: I1b530f1c5c495b8231fd68bed788d4567096683d
2017-01-26 09:06:02 -08:00
Hugo Benichi
88932754ff Captive portals: login activity probes like NetworkMonitor
This patch changes CaptivePortalLoginActivity captive portal test to be
consistent with NetworkMonitor by:
 - using Network.java to open the http connection.
 - adding a UserAgent property to the request header.

Test: manually tested.
Bug: 32369183

(cherry picked from commit cdf3ba48cc)

Change-Id: I559eb0497475daad758ba3b3395225dcd0a27a57
2017-01-26 18:53:03 +09:00
Hugo Benichi
ef78d27703 Logging improvements in CaptivePortalLoginActivity
Logging improvements to help debugging captive portal issues.

Test: manually tested
Bug: 33126342

(cherry picked from commit 87de0c2067)

Change-Id: I52425b849412f6bd5c5ca1f0be7a49cc772497eb
2017-01-26 18:52:59 +09:00
Lorenzo Colitti
26a2dc5284 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 625166377b)

Change-Id: Ia82958192d978280715442e182c34f9da5c88c66
2017-01-26 18:51:27 +09:00
Pavlin Radoslavov
e667f7795f Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" am: 0645c21163
am: b3f1eaa504

Change-Id: Ie1f0e958b93bfb898a7fdbe3ed8f732190a3e7ac
2017-01-26 04:34:57 +00:00
Pavlin Radoslavov
b3f1eaa504 Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection"
am: 0645c21163

Change-Id: I66a7a5f8dc423c7999b4e0a39a272a837e66c847
2017-01-26 04:29:57 +00:00
Pavlin Radoslavov
79fdc5001d Fix wording ambiguity for Bluetooth LDAC Playback Quality selection
"Optimize for" -> "Optimized for"

Bug: 34687041
Test: UI Visual inspection
Change-Id: I112ed6451465750978181e6ee35f96fd76969e9c
2017-01-25 22:19:17 +00:00
Chen Xu
f2a5e432b0 Merge "support suw and post-suw cases for default app" am: 9fc8d99c76
am: ea55399ecc

Change-Id: I1b3a5c7aed8a2930ed98c81b1c2c391769d87fe5
2017-01-24 02:43:28 +00:00
Chen Xu
ea55399ecc Merge "support suw and post-suw cases for default app"
am: 9fc8d99c76

Change-Id: I7a451bf2cfdfd6db65208a46db9d664039297ace
2017-01-24 02:39:55 +00:00
fionaxu
72ee500527 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
2017-01-23 16:28:39 -08:00
Kazuki Kobayashi
8bf5945c3f Merge "Fix clipping for date and time on QS" am: a5f968806e
am: 6cad668a25

Change-Id: I19ae46145d788db06e64b1b1737b7c30ae53f7f0
2017-01-19 22:30:05 +00:00
Kazuki Kobayashi
6cad668a25 Merge "Fix clipping for date and time on QS"
am: a5f968806e

Change-Id: I75c89c14ba9fe723ce47bff9061c716aee225735
2017-01-19 22:25:23 +00:00
Treehugger Robot
a5f968806e Merge "Fix clipping for date and time on QS" 2017-01-19 22:17:35 +00:00
Paul Duffin
56a2ae1056 Merge "Prepare for removal of legacy-test from default targets" am: c74ccf1588
am: ab62fd67d8

Change-Id: I923de1762a15fca7dc255f9dfe0ecce6f54d333c
2017-01-19 11:44:56 +00:00
Paul Duffin
ab62fd67d8 Merge "Prepare for removal of legacy-test from default targets"
am: c74ccf1588

Change-Id: Id4876a2597171ac78062acf8194fce1af6d50b77
2017-01-19 11:40:22 +00:00
Paul Duffin
ccb0445027 Prepare for removal of legacy-test from default targets
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.

(cherry picked from 6387604f9e672ece85e07c4bcbd7be396867f06f)

Bug: 30188076
Test: make checkbuild
Merged-In: I13e88297731253420e4e5f5291d503f13a39a156
Change-Id: I58446eb8c45d8ac2bcdbc9fa40d1321e811bdd4b
2017-01-19 09:43:05 +00:00
Pavlin Radoslavov
14e9d1c33f Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am: 5fd543ec34
am: fd2f4bbcca

Change-Id: I3c253b5ee444f23fc81dc607dcc85e95b2aa3226
2017-01-18 20:30:44 +00:00
Pavlin Radoslavov
fd2f4bbcca Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
am: 5fd543ec34

Change-Id: I69c8396f015dc926c135a0284a347c6d6d8ca870
2017-01-18 20:26:52 +00:00
Tamas Berghammer
a553354e84 Merge "DO NOT MERGE: Revert "Fix build"" into nyc-mr1-dev-plus-aosp 2017-01-18 19:59:59 +00:00
Tamas Berghammer
b4050d8042 Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp 2017-01-18 19:59:59 +00:00
Tamas Berghammer
a0a908f5d6 DO NOT MERGE: Revert "Fix build"
This reverts commit 005055c070.

Change-Id: Ia71d1e95de48bc1d83a4924041953a2d42ed6a93
2017-01-18 19:35:07 +00:00
Tamas Berghammer
24d8553316 DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
This reverts commit cbd3f0c59a.

Change-Id: I6e8d193fa22e0e7e30b214c13ae0480d3c9b0dc6
2017-01-18 19:33:22 +00:00
Pavlin Radoslavov
0e038dec6f Update/cleanup Bluetooth Codec strings in Developer Settings
Misc. fixes and cleanup related to the Bluetooth Codec strings
in Developer Settings:

 * Update the codec name "aptX-HD" -> "aptX HD" to reflect the vendor
   defined writing:
   https://www.aptx.com/aptx-hd
 * Increase some of the "CHAR LIMIT" values for the purpose
   of translation to other languages
 * Update some of the text in the UI (for clarity)
 * Added new string: "Streaming: " that is used in the UI summary

Test: UI visual observation
Bug: b/34188102 b/34206536 b/34209576 b/34210861 b/34207126 b/34211204
Bug: b/34206992 b/34210910 b/34210162 b/34205434 b/34198432 b/34186749
Bug: b/34188141 b/34188657 b/34192932 b/34188655
Change-Id: I9dc609594864b5d29394c49e0bce64416706c81c
2017-01-18 19:03:44 +00:00
Jay
3f326e7011 Merge "Notify user switch event to NetworkController" am: 1aa24246cf
am: 4ab0e9f824

Change-Id: I51365e12797493e620e3146cc7e25eda8c2065c8
2017-01-18 15:49:58 +00:00
Jay
4ab0e9f824 Merge "Notify user switch event to NetworkController"
am: 1aa24246cf

Change-Id: I1c2cefbc0fff7d90a4c2a0314c3697ee198caab5
2017-01-18 15:43:51 +00:00
Treehugger Robot
1aa24246cf Merge "Notify user switch event to NetworkController" 2017-01-18 15:32:28 +00:00
Jason Monk
005055c070 Fix build
Test: treehugger
Change-Id: Ic33d5ff2d7845bf4edd81d3e966fce3f0e5956bb
2017-01-18 10:04:51 -05:00
Jason Monk
54bce9c6ff Merge "SystemUI: Add NFC tile" am: 943a52862e
am: 8fbdf116d0

Change-Id: I114a75548444e409d1f72183589c886ca9fbccbd
2017-01-18 14:24:48 +00:00
Jason Monk
8fbdf116d0 Merge "SystemUI: Add NFC tile"
am: 943a52862e

Change-Id: Icf68f41a0b930da0b846a9b71da1121ef4987d56
2017-01-18 14:19:48 +00:00
Tamas Berghammer
3db5d42f90 Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp 2017-01-18 12:58:01 +00:00
Anas Karbila
f7648f4483 SystemUI: Add NFC tile
This patch adds a tile for QuickSettings
which controls the setting of NFC.

The drawable is from material.io.

Test: Enable and disable NFC using tile

Change-Id: I7dfaf3a4dca0c01d24be397e43ab131eb9885f62
Signed-off-by: Anas Karbila <anaskarbila@aospa.co>
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
2017-01-18 12:12:03 +00:00
Kazuki Kobayashi
205fd0f5fc Fix clipping for date and time on QS
The bottom part of date and time on Quick Settings is cut off
when changing font size to "Largest" and display size to "Small".
To fix this issue, the height should be changed from 19dp
to "wrap_content".

Bug: 34365385
Test: manual - change font size to "Largest" and
               display size to "Small", and then open QS panel

Change-Id: I37047e57f535dfa8fcaccc8f9dd78c4ef699bc27
2017-01-18 06:33:31 +00:00
Chen Xu
c90dc2072c Merge "Default Carrier app for traffic mitigation" am: 4533b1ccdd
am: 1d0877f59e

Change-Id: I1df7d283d8339065d4418af562775c3aea56a707
2017-01-13 02:33:24 +00:00
Chen Xu
1d0877f59e Merge "Default Carrier app for traffic mitigation"
am: 4533b1ccdd

Change-Id: I999285660c3a53fb2da8f18ddde9042f611f4e96
2017-01-13 02:28:28 +00:00
Chen Xu
4533b1ccdd Merge "Default Carrier app for traffic mitigation" 2017-01-13 02:22:38 +00:00
fionaxu
a21a87b7a4 Default Carrier app for traffic mitigation
- have the basic function working, support traffic mitigation and
  captive portal login
- support carrier customization, OEM could configure a list of carrier
  actions to act upon certain signals
- unit test

Test: Manual test with live sim card & runtest --path
frameworks/base/packages/CarrierDefaultApp
Bug: 30958215

Change-Id: Ie99be3b95e8a1dd60fc51bef703836478fbde09d
2017-01-12 15:50:18 -08:00
Akira Oshimi
d999e53487 Merge "Fix clipping for edit screen of Quick Settings" am: e3677865a8
am: 49b68ad0cd

Change-Id: I02de0a87c633f4ffc8cee81e8773e31c9851d19d
2017-01-11 16:06:22 +00:00
Akira Oshimi
49b68ad0cd Merge "Fix clipping for edit screen of Quick Settings"
am: e3677865a8

Change-Id: Idb615698c433bd4436950cbf94ced95f02198cd9
2017-01-11 16:01:23 +00:00
Treehugger Robot
e3677865a8 Merge "Fix clipping for edit screen of Quick Settings" 2017-01-11 15:51:37 +00:00
Tamas Berghammer
cbd3f0c59a Update package names to work with the proto3 compiler
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
(cherry picked from commit 383db5ebcc)
2017-01-11 11:27:38 +00:00
Akira Oshimi
f157511744 Fix clipping for edit screen of Quick Settings
The width of the edit screen is fixed when the display size is updated
in landscape mode. So when the device is rotated to portrait mode, the
width is not updated and the edit screen is truncated.
To fix this issue, "match_parent" should be used to match to the width
of Notification Panel always.

Bug: 34206618
Test: manual - go to Settings, rotate device to landscape mode, change
               display size (Default > Large > Default), rotate device
               to portrait mode and show QS edit screen

Change-Id: I35ac623812908a61cd34357e6bda567cab55ace1
2017-01-11 02:58:34 +00:00
Treehugger Robot
60d10ea0f4 Merge changes I559eb049,I52425b84
* changes:
  DO NOT MERGE Captive portals: login activity probes like NetworkMonitor
  DO NOT MERGE Logging improvements in CaptivePortalLoginActivity
2017-01-11 01:06:57 +00:00
Pavlin Radoslavov
8905569c67 Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bfd7f9a1f8
am: d190040dd1

Change-Id: I051932a98729e91f4e6512c9fa84a7e261b8cd96
2017-01-07 01:29:44 +00:00
Pavlin Radoslavov
d190040dd1 Merge "Add Bluetooth Codec selection UI to the Developer Options"
am: bfd7f9a1f8

Change-Id: I0cc5f64f292a56e6301b294974c1bd3cc72664c0
2017-01-07 01:25:34 +00:00