Merge "Revert "Fix ContentObserver unregister issue"" am: 31419a4ad4 am: 8625194c19

am: cd816c1853 Change-Id: I278d9449ab47f9bdecac8ad1075daed7d718544a
2017-07-13 04:02:11 +00:00
parent 8d99ed44f2 cd816c1853
commit c2a76d16f0
1 changed files with 0 additions and 10 deletions
--- a/core/java/android/database/ContentObserver.java
+++ b/core/java/android/database/ContentObserver.java
@@ -193,11 +193,6 @@ 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));
@@ -218,11 +213,6 @@ public abstract class ContentObserver {

        @Override
        public void run() {
-            synchronized (mLock) {
-                if (mTransport == null) {
-                    return;
-                }
-            }
            ContentObserver.this.onChange(mSelfChange, mUri, mUserId);
        }
    }