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

Commit f2f1f270 authored by Chenbo Feng's avatar Chenbo Feng
Browse files

Move NetworkStatsFactory into service directory 

In order to notify netd to swap eBPF maps before pulling the
networkStats from eBPF maps, NetworkStatsFactory need to use the
NetdServices to issue binder calls. So it need to be moved from
framework/base/core to framework/base/service since object in
framework/base/core cannot get any system services. This change is also
necessary for setting up a lock inside NetworkStatsFactory to prevent
racing between two netstats caller since the lock need to be hold before
netd trigger the map swap.

Also fix the compile problem caused by moving the NetworkStatsFactory
and the related tests. Rename the packages and the jni functions to a
more proper name.

Bug: 124764595
Bug: 128900919
Test: NetworkStatsFactoryTest
      android.app.usage.cts.NetworkUsageStatsTest
      android.net.cts.TrafficStatsTest

Merged-In: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
Change-Id: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
parent 7754d368

core/jni/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ cc_library_shared { 
        "android_content_res_Configuration.cpp",

        "android_animation_PropertyValuesHolder.cpp",

        "android_security_Scrypt.cpp",

        "com_android_internal_net_NetworkStatsFactory.cpp",

        "com_android_internal_os_ClassLoaderFactory.cpp",

        "com_android_internal_os_FuseAppLoop.cpp",

        "com_android_internal_os_Zygote.cpp",

core/jni/AndroidRuntime.cpp

+0 −2
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ extern int register_android_content_res_Configuration(JNIEnv* env); 
extern int register_android_animation_PropertyValuesHolder(JNIEnv *env);

extern int register_android_security_Scrypt(JNIEnv *env);

extern int register_com_android_internal_content_NativeLibraryHelper(JNIEnv *env);

extern int register_com_android_internal_net_NetworkStatsFactory(JNIEnv *env);

extern int register_com_android_internal_os_ClassLoaderFactory(JNIEnv* env);

extern int register_com_android_internal_os_FuseAppLoop(JNIEnv* env);

extern int register_com_android_internal_os_Zygote(JNIEnv *env);
@@ -1538,7 +1537,6 @@ static const RegJNIRec gRegJNI[] = { 
    REG_JNI(register_android_animation_PropertyValuesHolder),

    REG_JNI(register_android_security_Scrypt),

    REG_JNI(register_com_android_internal_content_NativeLibraryHelper),

    REG_JNI(register_com_android_internal_net_NetworkStatsFactory),

    REG_JNI(register_com_android_internal_os_FuseAppLoop),

};

services/core/java/com/android/server/NetworkManagementService.java

+1 −1
Original line number Diff line number Diff line
@@ -88,10 +88,10 @@ import android.util.SparseIntArray; 
import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.app.IBatteryStats;

import com.android.internal.net.NetworkStatsFactory;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.HexDump;

import com.android.internal.util.Preconditions;

import com.android.server.net.NetworkStatsFactory;



import com.google.android.collect.Maps;

core/java/com/android/internal/net/NetworkStatsFactory.java→services/core/java/com/android/server/net/NetworkStatsFactory.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.internal.net;

package com.android.server.net;



import static android.net.NetworkStats.SET_ALL;

import static android.net.NetworkStats.TAG_ALL;

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

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ import android.util.proto.ProtoOutputStream; 


import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.net.NetworkStatsFactory;

import com.android.internal.net.VpnInfo;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.DumpUtils;