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

Commit c2c0442c authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge \\\"When uninstalling, only kill the requested user.\\\" into nyc-dev... 

Merge \\\"When uninstalling, only kill the requested user.\\\" into nyc-dev am: 060d5a0e am: 803a316d
am: bcc13530

Change-Id: I2c413747bafc9c1c0ed690b33e3f1fde48377eea
parents a3d9467a bcc13530

core/java/android/view/Choreographer.java

+13 −0
Original line number Diff line number Diff line
@@ -232,6 +232,19 @@ public final class Choreographer { 
        return sThreadInstance.get();

    }



    /** Destroys the calling thread's choreographer

     * @hide

     */

    public static void releaseInstance() {

        Choreographer old = sThreadInstance.get();

        sThreadInstance.remove();

        old.dispose();

    }



    private void dispose() {

        mDisplayEventReceiver.dispose();

    }



    /**

     * The amount of time, in milliseconds, between each frame of the animation.

     * <p>

core/java/com/android/internal/policy/BackdropFrameRenderer.java

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ public class BackdropFrameRenderer extends Thread implements Choreographer.Frame 
        synchronized (this) {

            // Make sure no more messages are being sent.

            mChoreographer = null;

            Choreographer.releaseInstance();

        }

    }

core/jni/android_view_DisplayEventReceiver.cpp

+3 −5
Original line number Diff line number Diff line
@@ -75,14 +75,12 @@ NativeDisplayEventReceiver::NativeDisplayEventReceiver(JNIEnv* env, 
NativeDisplayEventReceiver::~NativeDisplayEventReceiver() {

    JNIEnv* env = AndroidRuntime::getJNIEnv();

    env->DeleteGlobalRef(mReceiverWeakGlobal);

    ALOGV("receiver %p ~ dtor display event receiver.", this);

}



void NativeDisplayEventReceiver::dispose() {

    ALOGV("receiver %p ~ Disposing display event receiver.", this);



    if (!mReceiver.initCheck()) {

        mMessageQueue->getLooper()->removeFd(mReceiver.getFd());

    }

    DisplayEventDispatcher::dispose();

}



void NativeDisplayEventReceiver::dispatchVsync(nsecs_t timestamp, int32_t id, uint32_t count) {
@@ -137,7 +135,7 @@ static jlong nativeInit(JNIEnv* env, jclass clazz, jobject receiverWeak, 
}



static void nativeDispose(JNIEnv* env, jclass clazz, jlong receiverPtr) {

    sp<NativeDisplayEventReceiver> receiver =

    NativeDisplayEventReceiver* receiver =

            reinterpret_cast<NativeDisplayEventReceiver*>(receiverPtr);

    receiver->dispose();

    receiver->decStrong(gDisplayEventReceiverClassInfo.clazz); // drop reference held by the object