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

Commit 368d3e9a authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "android_util_Binder: strict RefBase" into main am: 29d1818a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3474411



Change-Id: I5a25d759e353d5ae59db47432670d3d4299a331a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e044b70f 29d1818a

core/jni/android_util_Binder.cpp

+18 −14
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#undef ANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION // TODO:remove this and fix code



#define LOG_TAG "JavaBinder"

// #define LOG_NDEBUG 0
@@ -479,7 +477,7 @@ public: 
        if (b) return b;



        // b/360067751: constructor may trigger GC, so call outside lock

        b = new JavaBBinder(env, obj);

        b = sp<JavaBBinder>::make(env, obj);



        {

            AutoMutex _l(mLock);
@@ -646,11 +644,17 @@ public: 
        } else {

            mObject = env->NewGlobalRef(object);

        }

    }



    void onFirstRef() override {

        T::onFirstRef();



        sp<RecipientList<T>> list = mList.promote();

        // These objects manage their own lifetimes so are responsible for final bookkeeping.

        // The list holds a strong reference to this object.

        LOG_DEATH_FREEZE("%s Adding JavaRecipient %p to RecipientList %p", logPrefix<T>(), this,

                         list.get());

        list->add(this);

        list->add(sp<JavaRecipient>::fromExisting(this));

    }



    void clearReference() {
@@ -658,7 +662,7 @@ public: 
        if (list != NULL) {

            LOG_DEATH_FREEZE("%s Removing JavaRecipient %p from RecipientList %p", logPrefix<T>(),

                             this, list.get());

            list->remove(this);

            list->remove(sp<JavaRecipient>::fromExisting(this));

        } else {

            LOG_DEATH_FREEZE("%s clearReference() on JavaRecipient %p but RecipientList wp purged",

                             logPrefix<T>(), this);
@@ -940,7 +944,7 @@ struct BinderProxyNativeData { 
    // Frozen state change callbacks for mObject. Reference counted only because

    // JavaFrozenStateChangeCallback hold a weak reference that can be

    // temporarily promoted.

    sp<FrozenStateChangeCallbackList> mFrozenStateChangCallbackList;

    sp<FrozenStateChangeCallbackList> mFrozenStateChangeCallbackList;

};



BinderProxyNativeData* getBPNativeData(JNIEnv* env, jobject obj) {
@@ -965,8 +969,8 @@ jobject javaObjectForIBinder(JNIEnv* env, const sp<IBinder>& val) 
    }



    BinderProxyNativeData* nativeData = new BinderProxyNativeData();

    nativeData->mOrgue = new DeathRecipientList;

    nativeData->mFrozenStateChangCallbackList = new FrozenStateChangeCallbackList;

    nativeData->mOrgue = sp<DeathRecipientList>::make();

    nativeData->mFrozenStateChangeCallbackList = sp<FrozenStateChangeCallbackList>::make();

    nativeData->mObject = val;



    jobject object = env->CallStaticObjectMethod(gBinderProxyOffsets.mClass,
@@ -1572,8 +1576,8 @@ static void android_os_BinderProxy_linkToDeath(JNIEnv* env, jobject obj, 
    LOG_DEATH_FREEZE("linkToDeath: binder=%p recipient=%p\n", target, recipient);



    if (!target->localBinder()) {

        DeathRecipientList* list = nd->mOrgue.get();

        sp<JavaDeathRecipient> jdr = new JavaDeathRecipient(env, recipient, list);

        sp<DeathRecipientList> list = nd->mOrgue;

        sp<JavaDeathRecipient> jdr = sp<JavaDeathRecipient>::make(env, recipient, list);

        status_t err = target->linkToDeath(jdr, NULL, flags);

        if (err != NO_ERROR) {

            // Failure adding the death recipient, so clear its reference
@@ -1649,7 +1653,7 @@ static void android_os_BinderProxy_addFrozenStateChangeCallback( 
    LOG_DEATH_FREEZE("addFrozenStateChangeCallback: binder=%p callback=%p\n", target, callback);



    if (!target->localBinder()) {

        FrozenStateChangeCallbackList* list = nd->mFrozenStateChangCallbackList.get();

        sp<FrozenStateChangeCallbackList> list = nd->mFrozenStateChangeCallbackList;

        auto jfscc = sp<JavaFrozenStateChangeCallback>::make(env, callback, list);

        status_t err = target->addFrozenStateChangeCallback(jfscc);

        if (err != NO_ERROR) {
@@ -1683,7 +1687,7 @@ static jboolean android_os_BinderProxy_removeFrozenStateChangeCallback(JNIEnv* e 
        status_t err = NAME_NOT_FOUND;



        // If we find the matching callback, proceed to unlink using that

        FrozenStateChangeCallbackList* list = nd->mFrozenStateChangCallbackList.get();

        FrozenStateChangeCallbackList* list = nd->mFrozenStateChangeCallbackList.get();

        sp<JavaRecipient<IBinder::FrozenStateChangeCallback> > origJFSCC = list->find(callback);

        LOG_DEATH_FREEZE("   removeFrozenStateChangeCallback found list %p and JFSCC %p", list,

                         origJFSCC.get());
@@ -1712,7 +1716,7 @@ static void BinderProxy_destroy(void* rawNativeData) 
    BinderProxyNativeData * nativeData = (BinderProxyNativeData *) rawNativeData;

    LOG_DEATH_FREEZE("Destroying BinderProxy: binder=%p drl=%p fsccl=%p\n",

                     nativeData->mObject.get(), nativeData->mOrgue.get(),

                     nativeData->mFrozenStateChangCallbackList.get());

                     nativeData->mFrozenStateChangeCallbackList.get());

    delete nativeData;

    IPCThreadState::self()->flushCommands();

}