Commit graph android_packages_modules_Co.../services/core/java
Message SHA1
Temporarily restore the net.dnsX system properties.
This will limit app breakage in dogfood. The plan is to remove
these obsolete system properties again in O developer preview
builds so that application developers can move away from them.

Test: marlin boots and net.dnsX exists and is updated correctly

Bug: 33308258
Bug: 33807046
Bug: 34028616
Bug: 34115651
Change-Id: Iaf2fa213c314b7ba251c065b304e7e9869bafe9f

Lorenzo Colitti   commited 2017-01-06 03:09:18 +00:00
aefac392ea
NetworkNotificationManager: remove spammy log am: 9430f95c21
am: 08e147a7d0

Change-Id: I2b9b1b52e11ddf784244eedf1311f3b015841215

Hugo Benichi   authored and   android-build-merger   commited 2016-12-22 03:07:19 +00:00
cdb61441a0
NetworkNotificationManager: remove spammy log
am: 9430f95c21

Change-Id: I01785760854cd040c0d09f76e3832bbb7986dc4e

Hugo Benichi   authored and   android-build-merger   commited 2016-12-22 03:02:39 +00:00
08e147a7d0
NetworkNotificationManager: remove spammy log
Test: build, flashed, booted phone.
Bug: 32198726
Change-Id: I3ac2f07c756f48653195f6198aaee4d8b3939fb5

Hugo Benichi   commited 2016-12-22 09:51:01 +09:00
9430f95c21
DO NOT MERGE Stricter NetworkNotificationManagerTest
am: 85a6c96ef3

Change-Id: I94ea5c6994d181e730ec4f49e98001eb81ed8740

Hugo Benichi   authored and   android-build-merger   commited 2016-12-20 06:49:08 +00:00
b2966ad433
DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
am: f2e4cc9037

Change-Id: I79c4129b861b9dd93ac14acce5a86aadd48e8d39

Paul Stewart   authored and   android-build-merger   commited 2016-12-20 05:04:46 +00:00
3d205c909c
DO NOT MERGE Fix malformed log statement.
am: d7423d12a9

Change-Id: Ie52f24f39305f325e01972f5046247482053db28

Joe LaPenna   authored and   android-build-merger   commited 2016-12-20 05:04:02 +00:00
c4a0d516ce
DO NOT MERGE Stricter NetworkNotificationManagerTest
This patch changes NetworkNotificationManagerTest to populate extraInfo
of NetworkInfo in order to catch regressions in malformed format Strings
of log statements in NetworkNotificationManager.

Test: verified that the test fails when reintroducing the format String
bug.
Bug: 33737715

Change-Id: If14063554b8246d9d80cd222cb41c30dee121c5a

Hugo Benichi   commited 2016-12-20 05:02:28 +00:00
85a6c96ef3
DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
Commit 51727428fc added a string
format which caused an exception.  On top of the fixes to this
from 5a45327352, we can also fix
a few more issues here with some missing arguments to other
String.format invocations in the aforementioned CL, and other
formatting problems.

Bug: 33737715
Test: Build and run SUW

(cherry picked from commit e46b47d85d)

Change-Id: I40064d3e1a0f0300c43bdbc51839b579a5394a36

Paul Stewart   authored and   Hugo Benichi   commited 2016-12-20 12:31:49 +09:00
f2e4cc9037
DO NOT MERGE Fix malformed log statement.
Introduced in I1201d1d4fab8183dd83449c2afb2c35cfece883f

BUG: 33746580

Test: built, triggered notification, no crash.

(cherry picked from commit 5a45327352)

Change-Id: I50594ad865e6f95abc5c67c58af604ef2aa88f9b

Joe LaPenna   authored and   Hugo Benichi   commited 2016-12-20 12:31:45 +09:00
d7423d12a9
Fix other String.format issues in NetworkNotificationManager.java
Commit 51727428fc added a string
format which caused an exception.  On top of the fixes to this
from 5a45327352, we can also fix
a few more issues here with some missing arguments to other
String.format invocations in the aforementioned CL, and other
formatting problems.

Bug: 33737715
Test: Build and run SUW
Change-Id: I13410ffebbc606b8801656ea0934f96ccd4b5357

Paul Stewart   commited 2016-12-19 13:12:09 -08:00
e46b47d85d
Fix malformed log statement.
Introduced in I1201d1d4fab8183dd83449c2afb2c35cfece883f

BUG: 33746580

Test: built, triggered notification, no crash.

Change-Id: Ia3e5370f95a6cea421ae0d3febdc5e3fe156dceb

Joe LaPenna   commited 2016-12-19 10:35:10 -08:00
5a45327352
DO NOT MERGE Network notifications: revamp keying scheme
am: 6cccb3bec3

Change-Id: Ibad7d0210b2c69826462b781f43a82d65849ebfb

Hugo Benichi   authored and   android-build-merger   commited 2016-12-19 08:29:23 +00:00
a7c95ac2cb
DO NOT MERGE Unit tests for NetworkNotificationManager
am: f9b95ad8f3

Change-Id: I873ea4a5625c526d61017967604305ada548f907

Hugo Benichi   authored and   android-build-merger   commited 2016-12-19 08:29:11 +00:00
567cf7c47d
DO NOT MERGE Network notifications: revamp keying scheme
This patch changes the (tag: String, id: Int) keying scheme for network
notifications so that TRON notification counters can count network
related notifications unambiguously.

TRON instruments all notifications shown for package "android" as well
as user interactions with these Notifications. These counters are
grouped by id. However the network notifications ("no internet" dialog,
"captive portal sign in" dialog, ...) use a static tag and a dynamic id
for keying notifications, preventing the counters to correctly
aggregate. In addition there is also the risk of collision with other
SystemUi notification ids not managed by NetworkNotificationManager.

In order to make the TRON counters useful for network notifications,
the id is now encoding the network notification type in a stable way
while the tag is used to uniquely identify network notifications.

Test: change covered by previously added new unit tests.
Bug: 32198726
Bug: 33030620

(cherry picked from commit 51727428fc)

Change-Id: Iadf7f15da38de28587090ed0395f15c24d4ad442

Hugo Benichi   commited 2016-12-15 20:31:11 +09:00
6cccb3bec3
Merge "Network notifications: revamp keying scheme"
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2016-12-15 09:26:58 +00:00
b10d6c022e
DO NOT MERGE Unit tests for NetworkNotificationManager
Test: new unit test, no functional changes.
Bug: 32198726

(cherry picked from commit 20904677af)

Change-Id: Ib8a725cdd8c708ccb9cffad62321e0db8b27e593

Hugo Benichi   commited 2016-12-15 14:32:02 +09:00
f9b95ad8f3
Network notifications: revamp keying scheme
This patch changes the (tag: String, id: Int) keying scheme for network
notifications so that TRON notification counters can count network
related notifications unambiguously.

TRON instruments all notifications shown for package "android" as well
as user interactions with these Notifications. These counters are
grouped by id. However the network notifications ("no internet" dialog,
"captive portal sign in" dialog, ...) use a static tag and a dynamic id
for keying notifications, preventing the counters to correctly
aggregate. In addition there is also the risk of collision with other
SystemUi notification ids not managed by NetworkNotificationManager.

In order to make the TRON counters useful for network notifications,
the id is now encoding the network notification type in a stable way
while the tag is used to uniquely identify network notifications.

Test: change covered by previously added new unit tests.
Bug: 32198726
Bug: 33030620
Change-Id: I1201d1d4fab8183dd83449c2afb2c35cfece883f

Hugo Benichi   commited 2016-12-15 10:31:38 +09:00
51727428fc
More correct startup and shutdown procedures. am: af209807ce
am: 205f7599df

Change-Id: I5096f6a6f3d42bd55b9d3c80e279f2ee2fb0a795

Erik Kline   authored and   android-build-merger   commited 2016-12-14 11:46:26 +00:00
b9631bfd28
More correct startup and shutdown procedures.
am: af209807ce

Change-Id: Ib488e0cb49da2d3f655e189600f839721ea73358

Erik Kline   authored and   android-build-merger   commited 2016-12-14 11:39:36 +00:00
205f7599df
More correct startup and shutdown procedures.
During IpManager startup, anything sending messages to the state machine
must not begin doing so until after the state machine has been started.
Reorder the constructor accordingly.

During shutdown, AvoidBadWifiTracker needs to unregister the registered
BroadcastReceiver and might as well also unregister the ContentObserver.

Bug: 33388922
Change-Id: I58e07f7ccddaab160c153bcfb69fd45f50bb8710

Erik Kline   commited 2016-12-14 18:53:26 +09:00
af209807ce
Merge "Stop setting net.hostname" am: 042b78ef5e am: 06c37fff06 am: 2c062156df
am: 4559839045

Change-Id: Id89ab1373d9cf633d9fae45131f18eabc200a8f9

Erik Kline   authored and   android-build-merger   commited 2016-12-14 08:21:04 +00:00
e4bb6883da
Merge "Stop setting net.hostname" am: 042b78ef5e am: 06c37fff06
am: 2c062156df

Change-Id: I9976537d761a761e9aeca5cb15298f689032664f

Erik Kline   authored and   android-build-merger   commited 2016-12-14 08:13:30 +00:00
4559839045
Merge "Stop setting net.hostname" am: 042b78ef5e
am: 06c37fff06

Change-Id: Id261566422c4af7a3ce65877ba04b0a401685c23

Erik Kline   authored and   android-build-merger   commited 2016-12-14 08:07:01 +00:00
2c062156df
Merge "Stop setting net.hostname"
am: 042b78ef5e

Change-Id: Id03d2f8bf6fa8b447c5f32d3d2a51faef193ba62

Erik Kline   authored and   android-build-merger   commited 2016-12-14 07:59:59 +00:00
06c37fff06
Stop setting net.hostname
Test: as follows
    - basics:
        - built
        - flashed
        - booted
    - connect to {v4-only, dualstack, v6-only} networks
        - verified expected connectivity on each
    - runtest frameworks-net
Bug: 30979015

Change-Id: I65e9878c7b8eaddaba1c0e1b8566ddfa0760047f

Erik Kline   commited 2016-12-14 13:11:15 +09:00
06da441cfa
Merge "Unit tests for NetworkNotificationManager"
Hugo Benichi   authored and   Android (Google) Code Review   commited 2016-12-13 02:23:05 +00:00
399e0903e6
DO NOT MERGE Captive portal systel log improvements
am: 35ee7fd62e

Change-Id: Icbba206e8c035f566ff6d9e500d972a3dcf65bb6

Hugo Benichi   authored and   android-build-merger   commited 2016-12-13 00:32:46 +00:00
8009d903e1
Merge "Stop setting net.dns{1234} system properties." am: 2ecbd49edd am: 62f75e995a am: e17f2b6a8b
am: b33ceca786

Change-Id: I63216568d2ec5606fdfe108d0263714238dc1886

Erik Kline   authored and   android-build-merger   commited 2016-12-12 08:48:21 +00:00
728ae18d2a
Merge "Stop setting net.dns{1234} system properties." am: 2ecbd49edd
am: 62f75e995a

Change-Id: I7d400352de4bc11204cd1ec8c9aeda5381cd4931

Erik Kline   authored and   android-build-merger   commited 2016-12-12 08:35:20 +00:00
e17f2b6a8b
Merge "Stop setting net.dns{1234} system properties."
am: 2ecbd49edd

Change-Id: I9b31b281896995943ce8217c3230867db380a841

Erik Kline   authored and   android-build-merger   commited 2016-12-12 08:29:14 +00:00
62f75e995a
DO NOT MERGE Captive portal systel log improvements
This patch improves system logging around captive portal detection to
make inspection of bug reports sligthly easier:

- NetworkMonitor now logs by default CMD_CAPTIVE_PORTAL_RECHECK and
  CMD_CAPTIVE_PORTAL_APP_FINISHED. Other system logs are kept off with
  a new VDBG boolean contant,
- NetworkNotificationManager now prints the notification id at
  notification time. This allows to easily correlate show and clear.
- errors in NetworkNotificationManager are logged as Throwable instead
  of through their implicit toString() method.

Test: $ runtest frameworks-net
Bug: 32198726

(cherry picked from commit 6fe7d3cdb3)

Change-Id: I7780c389a94c4b9fa226f53b02fe5960d1c08618

Hugo Benichi   commited 2016-12-09 16:14:32 +09:00
35ee7fd62e
Stop setting net.dns{1234} system properties.
Nothing in the system consumes these properties, they were never part
of an official public API, and they can leak information about the
current network to applications without networking prvileges.

Specifically, these properites allow applications to access network state
(and detect network changes, etc.) without having the ACCESS_NETWORK_STATE
permission.

Test: runtest ConnectivityServiceTest passes
Bug: 33308258
Change-Id: I85abc52bc11aee33940fd0af2397478a9a5c3b8f

Erik Kline   commited 2016-12-09 11:06:52 +09:00
d19cf15010
DO NOT MERGE: [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 88087226a6)

Change-Id: I7cd3086544c881915fc6dbf14b87a24ab0cd8748

Etan Cohen   authored and   Lorenzo Colitti   commited 2016-12-08 17:13:37 +09:00
69e6a108a5
DO NOT MERGE: 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 3fd101e574)

Change-Id: I90c0f97fe0e41de4059bceae7b56ab3a70145696

Calvin On   authored and   Lorenzo Colitti   commited 2016-12-08 17:13:33 +09:00
488c84ca1f
DO NOT MERGE: Support timeouts for requestNetwork() invocations.
(cherry-pick of 8616c69985)
(cherry picked from commit 66721821df)

Bug: 21414325
Change-Id: I1a58823a372154589f972b98c4c428eab0e0523e

Erik Kline   authored and   Lorenzo Colitti   commited 2016-12-08 17:13:01 +09:00
950bfc31f9
DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is
specified for a given network.

Bug: 10705136

(cherry picked from commit 98f9c2c23b)

Change-Id: I89e2fdfbbfa981d435a2974422d9d9c009872d76

Pierre Imai   authored and   Lorenzo Colitti   commited 2016-12-08 16:49:22 +09:00
68902bc1df
Unit tests for NetworkNotificationManager
Test: new unit test, no functional changes.
Bug: 32198726
Change-Id: I7c371ee547b36531924df34846c26f56a7f2dd7a

Hugo Benichi   commited 2016-12-08 09:54:49 +09:00
20904677af
Merge "Captive portal systel log improvements"
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2016-11-24 03:45:57 +00:00
f8e0f14007
Captive portal systel log improvements
This patch improves system logging around captive portal detection to
make inspection of bug reports sligthly easier:

- NetworkMonitor now logs by default CMD_CAPTIVE_PORTAL_RECHECK and
  CMD_CAPTIVE_PORTAL_APP_FINISHED. Other system logs are kept off with
  a new VDBG boolean contant,
- NetworkNotificationManager now prints the notification id at
  notification time. This allows to easily correlate show and clear.
- errors in NetworkNotificationManager are logged as Throwable instead
  of through their implicit toString() method.

Test: $ runtest frameworks-net
Bug: 32198726
Change-Id: Id74a9912880083d41e27753240e781595081ff7a

Hugo Benichi   commited 2016-11-24 10:36:04 +09:00
6fe7d3cdb3
[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)
Change-Id: I2b7adffd82173cf8b99084cbfe5399961d51e148

Etan Cohen   commited 2016-11-21 19:15:10 +00:00
88087226a6
Merge "Add unit tests for Tethering.isTetherProvisioningRequired" am: 836ffa6e1c am: 4942a15e19 am: 1e0ea3cc22
am: 2ae41619ae

Change-Id: Iee7c8575ee22a494e2657e15e1aaae9b05a37045

Christopher Wiley   authored and   android-build-merger   commited 2016-10-25 18:43:16 +00:00
ab83d5b80c
Merge "Add unit tests for Tethering.isTetherProvisioningRequired" am: 836ffa6e1c
am: 4942a15e19

Change-Id: Ica704d0a64dde80ae0a9f1cef0250bfbdafcd49a

Christopher Wiley   authored and   android-build-merger   commited 2016-10-25 18:31:02 +00:00
1e0ea3cc22
Merge "Add unit tests for Tethering.isTetherProvisioningRequired"
am: 836ffa6e1c

Change-Id: I1dab386e3891c01a2917c32847d2aecdbfa10102

Christopher Wiley   authored and   android-build-merger   commited 2016-10-25 18:23:02 +00:00
4942a15e19
Add unit tests for Tethering.isTetherProvisioningRequired
Check that we tolerate various dependencies not being available.

Bug: 31946071
Test: These are tests

Change-Id: Ic0a9cd6f255ba9ff4c774dee640df1a0bdf8dc39

Christopher Wiley   commited 2016-10-24 17:07:05 -07:00
a28f756e2d
Add option to skip and avoid captive portals.
am: 1bf7fdd625

Change-Id: Id38d5c03d06822f9b20abd65db9dd04c90110b63

Calvin On   authored and   android-build-merger   commited 2016-10-20 20:18:10 +00:00
16da19b314
Add option to skip and avoid captive portals.
Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug: 30222699
Change-Id: Ibe63942da04748ab0406e24e0f44be31d47710a0
(cherry picked from commit 3fd101e574)

Calvin On   commited 2016-10-20 18:50:46 +00:00
1bf7fdd625
Add option to skip and avoid captive portals.
Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug: 30222699
Change-Id: Ibe63942da04748ab0406e24e0f44be31d47710a0

Calvin On   commited 2016-10-20 00:51:39 -07:00
3fd101e574
Refactor "avoid bad wifi" logic into a utility class am: fc52be9643 am: f0582faceb am: fdb7b562cf
am: 8bd57a31b8

Change-Id: Ie3d058d6c9da43763d10b0a2bc96171d07673e9d

Erik Kline   authored and   android-build-merger   commited 2016-10-07 01:03:58 +00:00
58d1a44fbe
Refactor "avoid bad wifi" logic into a utility class am: fc52be9643 am: f0582faceb
am: fdb7b562cf

Change-Id: I7db61e54c80ec836d00bf4ae087137bb296c30f1

Erik Kline   authored and   android-build-merger   commited 2016-10-06 20:44:56 +00:00
8bd57a31b8