Merge "Toast: Fix JE caused by service not bind" (ddf2f52d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/DisplayHashController.java

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -369,9 +369,6 @@ public class DisplayHashController {
	if (mServiceConnection == null) {		if (mServiceConnection == null) {
	if (DEBUG) Slog.v(TAG, "creating connection");		if (DEBUG) Slog.v(TAG, "creating connection");

	// Create the connection
	mServiceConnection = new DisplayHashingServiceConnection();

	final ComponentName component = getServiceComponentName();		final ComponentName component = getServiceComponentName();
	if (DEBUG) Slog.v(TAG, "binding to: " + component);		if (DEBUG) Slog.v(TAG, "binding to: " + component);
	if (component != null) {		if (component != null) {
	@@ -379,6 +376,8 @@ public class DisplayHashController {
	intent.setComponent(component);		intent.setComponent(component);
	final long token = Binder.clearCallingIdentity();		final long token = Binder.clearCallingIdentity();
	try {		try {
			// Create the connection
			mServiceConnection = new DisplayHashingServiceConnection();
	mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE);		mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE);
	if (DEBUG) Slog.v(TAG, "bound");		if (DEBUG) Slog.v(TAG, "bound");
	} finally {		} finally {
	@@ -387,9 +386,11 @@ public class DisplayHashController {
	}		}
	}		}

			if (mServiceConnection != null) {
	mServiceConnection.runCommandLocked(command);		mServiceConnection.runCommandLocked(command);
	}		}
	}		}
			}

	@Nullable		@Nullable
	private ServiceInfo getServiceInfo() {		private ServiceInfo getServiceInfo() {