am 82d14d60: Merge "Crashing the system process is inadvisable" into mnc-dev

* commit '82d14d60e7a772ecf45b637fd51a2335ad2a40cf':
  Crashing the system process is inadvisable
This commit is contained in:
Chris Tate
2015-08-28 19:58:35 +00:00
committed by Android Git Automerger

View File

@@ -1955,10 +1955,12 @@ public class BackupManagerService {
.setPackage(pkgInfo.packageName);
List<ResolveInfo> hosts = mPackageManager.queryIntentServicesAsUser(
intent, 0, UserHandle.USER_OWNER);
final int N = hosts.size();
for (int i = 0; i < N; i++) {
final ServiceInfo info = hosts.get(i).serviceInfo;
tryBindTransport(info);
if (hosts != null) {
final int N = hosts.size();
for (int i = 0; i < N; i++) {
final ServiceInfo info = hosts.get(i).serviceInfo;
tryBindTransport(info);
}
}
}