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

Commit aee5787b authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by android-build-merger
Browse files

Merge "Fix ContentObserver unregister issue" am: 09b6988e 

am: 481d92c5

Change-Id: I2f6cfe7465a9816815172db2fb3defa8f49bdd31
parents d29b77a5 481d92c5

core/java/android/database/ContentObserver.java

+10 −0
Original line number Diff line number Diff line
@@ -193,6 +193,11 @@ public abstract class ContentObserver { 
     */

    private void dispatchChange(boolean selfChange, Uri uri, int userId) {

        if (mHandler == null) {

            synchronized (mLock) {

                if (mTransport == null) {

                    return;

                }

            }

            onChange(selfChange, uri, userId);

        } else {

            mHandler.post(new NotificationRunnable(selfChange, uri, userId));
@@ -213,6 +218,11 @@ public abstract class ContentObserver { 


        @Override

        public void run() {

            synchronized (mLock) {

                if (mTransport == null) {

                    return;

                }

            }

            ContentObserver.this.onChange(mSelfChange, mUri, mUserId);

        }

    }