Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517 am: aee5787b48 (1a84ad9e) · Commits · e / os / android_frameworks_base

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);
		}
		}