Merge "Revert "Fix ContentObserver unregister issue"" am: 31419a4ad4 am: 8625194c19 (c2a76d16) · Commits · e / os / android_frameworks_base

core/java/android/database/ContentObserver.java

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -193,11 +193,6 @@ public abstract class ContentObserver {
	*/		*/
	private void dispatchChange(boolean selfChange, Uri uri, int userId) {		private void dispatchChange(boolean selfChange, Uri uri, int userId) {
	if (mHandler == null) {		if (mHandler == null) {
	synchronized (mLock) {
	if (mTransport == null) {
	return;
	}
	}
	onChange(selfChange, uri, userId);		onChange(selfChange, uri, userId);
	} else {		} else {
	mHandler.post(new NotificationRunnable(selfChange, uri, userId));		mHandler.post(new NotificationRunnable(selfChange, uri, userId));
	@@ -218,11 +213,6 @@ public abstract class ContentObserver {

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