LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for a884d81e to stage-aosp-master

Browse Source 
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
This commit is contained in:
Elliott Hughes
2015-09-24 10:01:32 -07:00
parent 06a45679aa aa49801a92
commit 8dc3833e83
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_net_TrafficStats.cpp
View File

@@ -185,7 +185,7 @@ static jlong getUidStat(JNIEnv* env, jclass clazz, jint uid, jint type) {
} }
} }
static JNINativeMethod gMethods[] = { static const JNINativeMethod gMethods[] = {
{"nativeGetTotalStat", "(I)J", (void*) getTotalStat}, {"nativeGetTotalStat", "(I)J", (void*) getTotalStat},
{"nativeGetIfaceStat", "(Ljava/lang/String;I)J", (void*) getIfaceStat}, {"nativeGetIfaceStat", "(Ljava/lang/String;I)J", (void*) getIfaceStat},
{"nativeGetUidStat", "(II)J", (void*) getUidStat}, {"nativeGetUidStat", "(II)J", (void*) getUidStat},

2
core/jni/com_android_internal_net_NetworkStatsFactory.cpp
View File

@@ -284,7 +284,7 @@ static int readNetworkStatsDetail(JNIEnv* env, jclass clazz, jobject stats,
return 0; return 0;
} }
static JNINativeMethod gMethods[] = { static const JNINativeMethod gMethods[] = {
{ "nativeReadNetworkStatsDetail", { "nativeReadNetworkStatsDetail",
"(Landroid/net/NetworkStats;Ljava/lang/String;I[Ljava/lang/String;I)I", "(Landroid/net/NetworkStats;Ljava/lang/String;I[Ljava/lang/String;I)I",
(void*) readNetworkStatsDetail } (void*) readNetworkStatsDetail }