Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fa3b9e2 authored by Junyu Lai's avatar Junyu Lai Committed by Gerrit Code Review
Browse files

Merge changes from topic "sp20-stats-provider-permission" 

* changes:
  [SP20] Check signature permission when accessing network stats provider
  Add permission check functions to NetworkStatsService
parents 14906e7a ddbbe588

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ package android { 
    field public static final String NETWORK_SETUP_WIZARD = "android.permission.NETWORK_SETUP_WIZARD";

    field public static final String NETWORK_SIGNAL_STRENGTH_WAKEUP = "android.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP";

    field public static final String NETWORK_STACK = "android.permission.NETWORK_STACK";

    field public static final String NETWORK_STATS_PROVIDER = "android.permission.NETWORK_STATS_PROVIDER";

    field public static final String NOTIFICATION_DURING_SETUP = "android.permission.NOTIFICATION_DURING_SETUP";

    field public static final String NOTIFY_TV_INPUTS = "android.permission.NOTIFY_TV_INPUTS";

    field public static final String OBSERVE_APP_USAGE = "android.permission.OBSERVE_APP_USAGE";
@@ -1239,7 +1240,7 @@ package android.app.usage { 
  }















  public class NetworkStatsManager {













    method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public android.net.netstats.provider.NetworkStatsProviderCallback registerNetworkStatsProvider(@NonNull String, @NonNull android.net.netstats.provider.AbstractNetworkStatsProvider);













    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_STATS_PROVIDER, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public android.net.netstats.provider.NetworkStatsProviderCallback registerNetworkStatsProvider(@NonNull String, @NonNull android.net.netstats.provider.AbstractNetworkStatsProvider);















  }





























  public static final class UsageEvents.Event {

































core/java/android/app/usage/NetworkStatsManager.java



+4
−1




























Original line number
Diff line number
Diff line








@@ -29,6 +29,7 @@ import android.net.ConnectivityManager;













import android.net.DataUsageRequest;















import android.net.INetworkStatsService;















import android.net.NetworkIdentity;













import android.net.NetworkStack;















import android.net.NetworkTemplate;















import android.net.netstats.provider.AbstractNetworkStatsProvider;















import android.net.netstats.provider.NetworkStatsProviderCallback;










@@ -540,7 +541,9 @@ public class NetworkStatsManager {













     * @hide















     */















    @SystemApi













    @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS)













    @RequiresPermission(anyOf = {













            android.Manifest.permission.NETWORK_STATS_PROVIDER,













            NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK})















    @NonNull public NetworkStatsProviderCallback registerNetworkStatsProvider(















            @NonNull String tag,















            @NonNull AbstractNetworkStatsProvider provider) {

































core/res/AndroidManifest.xml



+4
−0




























Original line number
Diff line number
Diff line








@@ -1645,6 +1645,10 @@













    <permission android:name="android.permission.NETWORK_FACTORY"















                android:protectionLevel="signature" />





























    <!-- @SystemApi @hide Allows applications to access network stats provider -->













    <permission android:name="android.permission.NETWORK_STATS_PROVIDER"













                android:protectionLevel="signature" />





























    <!-- Allows Settings and SystemUI to call methods in Networking services















         <p>Not for use by third-party or privileged applications.















         @SystemApi @TestApi

































services/core/java/com/android/server/net/NetworkStatsService.java



+22
−1




























Original line number
Diff line number
Diff line








@@ -17,12 +17,14 @@













package com.android.server.net;































import static android.Manifest.permission.ACCESS_NETWORK_STATE;













import static android.Manifest.permission.NETWORK_STATS_PROVIDER;















import static android.Manifest.permission.READ_NETWORK_USAGE_HISTORY;















import static android.Manifest.permission.UPDATE_DEVICE_STATS;















import static android.content.Intent.ACTION_SHUTDOWN;















import static android.content.Intent.ACTION_UID_REMOVED;















import static android.content.Intent.ACTION_USER_REMOVED;















import static android.content.Intent.EXTRA_UID;













import static android.content.pm.PackageManager.PERMISSION_GRANTED;















import static android.net.ConnectivityManager.ACTION_TETHER_STATE_CHANGED;















import static android.net.ConnectivityManager.isNetworkTypeMobile;















import static android.net.NetworkStack.checkNetworkStackPermission;










@@ -1793,6 +1795,24 @@ public class NetworkStatsService extends INetworkStatsService.Stub {













        }















    }





























    // TODO: It is copied from ConnectivitySerivce, consider refactor these check permission













    //  functions to a proper util.













    private boolean checkAnyPermissionOf(String... permissions) {













        for (String permission : permissions) {













            if (mContext.checkCallingOrSelfPermission(permission) == PERMISSION_GRANTED) {













                return true;













            }













        }













        return false;













    }



























    private void enforceAnyPermissionOf(String... permissions) {













        if (!checkAnyPermissionOf(permissions)) {













            throw new SecurityException("Requires one of the following permissions: "













                    + String.join(", ", permissions) + ".");













        }













    }





























    /**















     * Registers a custom provider of {@link android.net.NetworkStats} to combine the network















     * statistics that cannot be seen by the kernel to system. To unregister, invoke the









@@ -1809,7 +1829,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {













     */















    public @NonNull INetworkStatsProviderCallback registerNetworkStatsProvider(















            @NonNull String tag, @NonNull INetworkStatsProvider provider) {













        mContext.enforceCallingOrSelfPermission(UPDATE_DEVICE_STATS, TAG);













        enforceAnyPermissionOf(NETWORK_STATS_PROVIDER,













                NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK);















        Objects.requireNonNull(provider, "provider is null");















        Objects.requireNonNull(tag, "tag is null");















        try {

































tests/net/AndroidManifest.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -47,6 +47,7 @@













    <uses-permission android:name="android.permission.NETWORK_STACK" />















    <uses-permission android:name="android.permission.OBSERVE_NETWORK_POLICY" />















    <uses-permission android:name="android.permission.NETWORK_FACTORY" />













    <uses-permission android:name="android.permission.NETWORK_STATS_PROVIDER" />































    <application>















        <uses-library android:name="android.test.runner" />