Merge "Revert "Logging to track #36406078"" (b2b9ac2c) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+0 −18

Original line number	Diff line number	Diff line
		@@ -808,11 +808,6 @@ public final class ActivityThread {
		public final void scheduleReceiver(Intent intent, ActivityInfo info,
		CompatibilityInfo compatInfo, int resultCode, String data, Bundle extras,
		boolean sync, int sendingUser, int processState) {
		// TODO: Debugging added for bug:36406078 . Remove when done
		if (Log.isLoggable("36406078", Log.DEBUG)) {
		Log.d(TAG, "scheduleReceiver");
		}

		updateProcessState(processState, false);
		ReceiverData r = new ReceiverData(intent, resultCode, data, extras,
		sync, false, mAppThread.asBinder(), sendingUser);
		@@ -899,11 +894,6 @@ public final class ActivityThread {
		CompatibilityInfo compatInfo, Map services, Bundle coreSettings,
		String buildSerial) {

		// TODO: Debugging added for bug:36406078 . Remove when done
		if (Log.isLoggable("36406078", Log.DEBUG)) {
		Log.d(TAG, "bindApplication: " + processName);
		}

		if (services != null) {
		// Setup the service cache in the ServiceManager
		ServiceManager.initServiceCache(services);
		@@ -3239,10 +3229,6 @@ public final class ActivityThread {
		if (receiver.getPendingResult() != null) {
		data.finish();
		}
		// TODO: Debugging added for bug:36406078 . Remove when done
		if (Log.isLoggable("36406078", Log.DEBUG)) {
		Log.d(TAG, "handleReceiver done");
		}
		}

		// Instantiate a BackupAgent and tell it that it's alive
		@@ -5778,10 +5764,6 @@ public final class ActivityThread {
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		// TODO: Debugging added for bug:36406078 . Remove when done
		if (Log.isLoggable("36406078", Log.DEBUG)) {
		Log.d(TAG, "handleBindApplication done");
		}
		}

		/package/ final void finishInstrumentation(int resultCode, Bundle results) {