Merge "Fix a deadlock I ran into." into gingerbread (045398e6) · Commits · e / os / android_frameworks_base

services/java/com/android/server/am/ActivityManagerService.java

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -9621,6 +9621,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	Slog.e(TAG, "Backup agent created for " + agentPackageName + " but not requested!");		Slog.e(TAG, "Backup agent created for " + agentPackageName + " but not requested!");
	return;		return;
	}		}
			}

	long oldIdent = Binder.clearCallingIdentity();		long oldIdent = Binder.clearCallingIdentity();
	try {		try {
	@@ -9636,7 +9637,6 @@ public final class ActivityManagerService extends ActivityManagerNative
	Binder.restoreCallingIdentity(oldIdent);		Binder.restoreCallingIdentity(oldIdent);
	}		}
	}		}
	}

	// done with this agent		// done with this agent
	public void unbindBackupAgent(ApplicationInfo appInfo) {		public void unbindBackupAgent(ApplicationInfo appInfo) {