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

Commit 445f60fc authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-merger
Browse files

Merge "Fix gNumProxies double increment." am: 18f8500e 

am: 1b4f5374

Change-Id: I39f5db2bf430051d80ef27fe312cf3f397774edd
parents b6b2957b 1b4f5374

core/jni/android_util_Binder.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -664,7 +664,7 @@ jobject javaObjectForIBinder(JNIEnv* env, const sp<IBinder>& val) 
        nativeData->mObject = val;

        nativeData->mObject = val;

        gNativeDataCache = nullptr;

        gNativeDataCache = nullptr;

        ++gNumProxies;

        ++gNumProxies;

        if (++gNumProxies >= gProxiesWarned + PROXY_WARN_INTERVAL) {

        if (gNumProxies >= gProxiesWarned + PROXY_WARN_INTERVAL) {

            ALOGW("Unexpectedly many live BinderProxies: %d\n", gNumProxies);

            ALOGW("Unexpectedly many live BinderProxies: %d\n", gNumProxies);

            gProxiesWarned = gNumProxies;

            gProxiesWarned = gNumProxies;

        }

        }