am 5daf77d0: am ac39c604: Merge "Fix formatting in clearApplicationUserData exception message."

* commit '5daf77d00d0fd93f24f9dc6013ee838411e9adf9':
  Fix formatting in clearApplicationUserData exception message.
This commit is contained in:
Christopher Tate
2013-09-13 15:05:31 -07:00
committed by Android Git Automerger

View File

@ -3748,9 +3748,9 @@ public final class ActivityManagerService extends ActivityManagerNative
== PackageManager.PERMISSION_GRANTED) {
forceStopPackageLocked(packageName, pkgUid, "clear data");
} else {
throw new SecurityException(pid+" does not have permission:"+
android.Manifest.permission.CLEAR_APP_USER_DATA+" to clear data" +
"for process:"+packageName);
throw new SecurityException("PID " + pid + " does not have permission "
+ android.Manifest.permission.CLEAR_APP_USER_DATA + " to clear data"
+ " of package " + packageName);
}
}