am 000ef01c: Merge "Permit crash report button for user profiles" into lmp-dev

* commit '000ef01cdf74e1b95d28be2a465fe69ac747843b':
  Permit crash report button for user profiles
This commit is contained in:
Robin Lee
2014-08-07 10:38:28 +00:00
committed by Android Git Automerger

View File

@@ -10585,14 +10585,16 @@ public final class ActivityManagerService extends ActivityManagerNative
}
void startAppProblemLocked(ProcessRecord app) {
if (app.userId == mCurrentUserId) {
app.errorReportReceiver = ApplicationErrorReport.getErrorReportReceiver(
mContext, app.info.packageName, app.info.flags);
} else {
// If this app is not running under the current user, then we
// can't give it a report button because that would require
// launching the report UI under a different user.
app.errorReportReceiver = null;
// If this app is not running under the current user, then we
// can't give it a report button because that would require
// launching the report UI under a different user.
app.errorReportReceiver = null;
for (int userId : mCurrentProfileIds) {
if (app.userId == userId) {
app.errorReportReceiver = ApplicationErrorReport.getErrorReportReceiver(
mContext, app.info.packageName, app.info.flags);
}
}
skipCurrentReceiverLocked(app);
}