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

Commit 3d83380b authored by Ken Chen's avatar Ken Chen
Browse files

Remove QTagUid_ prefix from function names 

QTagUid_tagSocketFd -> tagSocketFd
QTagUid_untagSocketFd -> untagSocketFd
QTagUid_setCounterSet -> setCounterSet
QTagUid_deleteTagData -> deleteTagData

Bug: N/A
Test: m
Change-Id: I4753cae7ed132e020c5ef8d155dfe2551a792d04
parent 846fd78c

core/jni/android_server_NetworkManagementSocketTagger.cpp

+9 −15
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ 


namespace android {



static jint QTagUid_tagSocketFd(JNIEnv* env, jclass,

                                jobject fileDescriptor,

static jint tagSocketFd(JNIEnv* env, jclass, jobject fileDescriptor,

                        jint tagNum, jint uid) {

  int userFd = jniGetFDFromFileDescriptor(env, fileDescriptor);
@@ -47,8 +46,7 @@ static jint QTagUid_tagSocketFd(JNIEnv* env, jclass, 
  return (jint)res;

}



static jint QTagUid_untagSocketFd(JNIEnv* env, jclass,

                                  jobject fileDescriptor) {

static jint untagSocketFd(JNIEnv* env, jclass, jobject fileDescriptor) {

  int userFd = jniGetFDFromFileDescriptor(env, fileDescriptor);



  if (env->ExceptionCheck()) {
@@ -63,9 +61,7 @@ static jint QTagUid_untagSocketFd(JNIEnv* env, jclass, 
  return (jint)res;

}



static jint QTagUid_setCounterSet(JNIEnv* env, jclass,

                                  jint setNum, jint uid) {



static jint setCounterSet(JNIEnv* env, jclass, jint setNum, jint uid) {

  int res = qtaguid_setCounterSet(setNum, uid);

  if (res < 0) {

    return (jint)-errno;
@@ -73,9 +69,7 @@ static jint QTagUid_setCounterSet(JNIEnv* env, jclass, 
  return (jint)res;

}



static jint QTagUid_deleteTagData(JNIEnv* env, jclass,

                                  jint tagNum, jint uid) {



static jint deleteTagData(JNIEnv* env, jclass, jint tagNum, jint uid) {

  int res = qtaguid_deleteTagData(tagNum, uid);

  if (res < 0) {

    return (jint)-errno;
@@ -84,10 +78,10 @@ static jint QTagUid_deleteTagData(JNIEnv* env, jclass, 
}



static const JNINativeMethod gQTagUidMethods[] = {

  { "native_tagSocketFd", "(Ljava/io/FileDescriptor;II)I", (void*)QTagUid_tagSocketFd},

  { "native_untagSocketFd", "(Ljava/io/FileDescriptor;)I", (void*)QTagUid_untagSocketFd},

  { "native_setCounterSet", "(II)I", (void*)QTagUid_setCounterSet},

  { "native_deleteTagData", "(II)I", (void*)QTagUid_deleteTagData},

  { "native_tagSocketFd", "(Ljava/io/FileDescriptor;II)I", (void*)tagSocketFd},

  { "native_untagSocketFd", "(Ljava/io/FileDescriptor;)I", (void*)untagSocketFd},

  { "native_setCounterSet", "(II)I", (void*)setCounterSet},

  { "native_deleteTagData", "(II)I", (void*)deleteTagData},

};



int register_android_server_NetworkManagementSocketTagger(JNIEnv* env) {