Merge "Fix ContentObserver unregister issue"

am: 09b6988e27 Change-Id: I242e87b53f603a05ba7c4069662456457a3d980a
2017-07-06 18:21:54 +00:00
parent 311b2a31fa 09b6988e27
commit 481d92c517
1 changed files with 10 additions and 0 deletions
--- a/core/java/android/database/ContentObserver.java
+++ b/core/java/android/database/ContentObserver.java
@@ -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);
        }
    }