OSDN Git Service

Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces
authorChiachang Wang <chiachangwang@google.com>
Wed, 10 Apr 2019 06:24:41 +0000 (23:24 -0700)
committerChiachang Wang <chiachangwang@google.com>
Wed, 10 Apr 2019 06:36:55 +0000 (06:36 +0000)
commitbd92d1539f29c0e7082756dcc0481e67a4079e62
tree4ba318964150fd58ecdb614c39547cd5c48a76d6
parentc8d2c7172369638a10f0538db29e64371ae19034
Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces

ConnectivityManager and its usages are removed from
NetworkStatsService. After that, forceUpdateIfaces requires
information that only ConnectivityService has, hence
restricting the calling permission to NETWORK_STACK or
MAINLINE_NETWORK_STACK permission. The required permission
will be changed from READ_NETWORK_USAGE_HISTORY to
NETWORK_STACK or MAINLINE_NETWORK_STACK. This change would make
it impossible to call outside the system.

Bug: 126830974
Test: atest FrameworksNetTests
Merged-In: I1b26dc64eaab2151e6885fd01cc5e8d4e18c4e60
Change-Id: I4ea421e4126a45f65d25fe0bec74243a3b20aeab
(cherry picked from commit 6b895dea25b4fca87d275bb78367411623ded1d4)
core/java/android/net/NetworkStack.java
services/core/java/com/android/server/net/NetworkStatsService.java
tests/net/java/android/net/NetworkStackTest.java [new file with mode: 0644]