Merge "Revert "Fix ContentObserver unregister issue""

am: 31419a4ad4

Change-Id: I455be72533c24ceb5ea352774ded30d0c0a2367f

1 files changed, 0 insertions, 10 deletions

diff --git a/core/java/android/database/ContentObserver.java b/core/java/android/database/ContentObserver.java
index 4795e979f644..5f01e300bf42 100644
--- 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);
         }
     }