Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use iterator to remove elements from collection when traversing it"

Browse Source
This commit is contained in:
Michal Karpinski
2017-03-03 10:02:13 +00:00
committed by Android (Google) Code Review
parent 5048c1cbb1 55e15bcc3a
commit 1df0623588
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
services/backup/java/com/android/server/backup/TransportManager.java
View File

@@ -41,6 +41,7 @@ import com.android.internal.backup.IBackupTransport;
import com.android.server.EventLogTags;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -103,13 +104,18 @@ class TransportManager {
// been removed from mBoundTransports because onServiceDisconnected would already been
// called on TransportConnection objects.
synchronized (mTransportLock) {
for (ComponentName transport : mValidTransports.keySet()) {
if (transport.getPackageName().equals(packageName)) {
TransportConnection removed = mValidTransports.remove(transport);
if (removed != null) {
mContext.unbindService(removed);
log_verbose("Package removed, Removing transport: " +
transport.flattenToShortString());
Iterator<Map.Entry<ComponentName, TransportConnection>> iter =
mValidTransports.entrySet().iterator();
while (iter.hasNext()) {
Map.Entry<ComponentName, TransportConnection> validTransport = iter.next();
ComponentName componentName = validTransport.getKey();
if (componentName.getPackageName().equals(packageName)) {
TransportConnection transportConnection = validTransport.getValue();
iter.remove();
if (transportConnection != null) {
mContext.unbindService(transportConnection);
log_verbose("Package removed, removing transport: "
+ componentName.flattenToShortString());
}
}
}
@@ -278,15 +284,16 @@ class TransportManager {
}
private void tryBindTransport(ServiceInfo transport) {
Slog.d(TAG, "Binding to transport: " + transport.getComponentName().flattenToShortString());
final ComponentName transportComponentName = transport.getComponentName();
Slog.d(TAG, "Binding to transport: " + transportComponentName.flattenToShortString());
// TODO: b/22388012 (Multi user backup and restore)
TransportConnection connection = new TransportConnection(transport.getComponentName());
if (bindToTransport(transport.getComponentName(), connection)) {
TransportConnection connection = new TransportConnection(transportComponentName);
if (bindToTransport(transportComponentName, connection)) {
synchronized (mTransportLock) {
mValidTransports.put(transport.getComponentName(), connection);
mValidTransports.put(transportComponentName, connection);
}
} else {
Slog.w(TAG, "Couldn't bind to transport " + transport.getComponentName());
Slog.w(TAG, "Couldn't bind to transport " + transportComponentName);
}
}