From 5d5f04b004f34182dff624c1fba623236aec9dbe Mon Sep 17 00:00:00 2001
From: Fyodor Kupolov <fkupolov@google.com>
Date: Thu, 13 Jul 2017 01:44:36 +0000
Subject: [PATCH] Revert "Fix ContentObserver unregister issue"

This reverts commit 2df4e144a913b705c50bde929c75744b251967d9.
It was causing failures in packages/apps/DocumentsUI tests

Bug: 63638102
Bug: 63154326
Change-Id: I51fb54f705f58f159f4fcc30bfed41ababcba950
---
 core/java/android/database/ContentObserver.java | 10 ----------
 1 file changed, 10 deletions(-)

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