Merge "[conflict] Merge "No need to make non-empty judgment." into main am:... (e94f8888) · Commits · e / os / android_frameworks_base

core/java/com/android/server/servicewatcher/ServiceWatcher.java

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -214,13 +214,9 @@ public interface ServiceWatcher {

	@Override		@Override
	public String toString() {		public String toString() {
	if (mComponentName == null) {
	return "none";
	} else {
	return mUid + "/" + mComponentName.flattenToShortString();		return mUid + "/" + mComponentName.flattenToShortString();
	}		}
	}		}
	}

	/**		/**
	* Creates a new ServiceWatcher instance.		* Creates a new ServiceWatcher instance.