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

Merge "Fixup lint errors in ServiceWatcher" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-23 17:19:15 +00:00
committed by Android (Google) Code Review
parent cb1cc4f5a9 33fc2dd635
commit 3878ef82a2
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/servicewatcher/ServiceWatcher.java
View File

@@ -176,7 +176,7 @@ public interface ServiceWatcher {
if (this == o) { if (this == o) {
return true; return true;
} }
if (o == null || getClass() != o.getClass()) { if (!(o instanceof BoundServiceInfo)) {
return false; return false;
} }

16
services/core/java/com/android/server/servicewatcher/ServiceWatcherImpl.java
View File

@@ -147,13 +147,23 @@ class ServiceWatcherImpl<TBoundServiceInfo extends BoundServiceInfo> implements
@Override @Override
public String toString() { public String toString() {
return mServiceConnection.getBoundServiceInfo().toString(); MyServiceConnection serviceConnection;
synchronized (this) {
serviceConnection = mServiceConnection;
}
return serviceConnection.getBoundServiceInfo().toString();
} }
@Override @Override
public void dump(PrintWriter pw) { public void dump(PrintWriter pw) {
pw.println("target service=" + mServiceConnection.getBoundServiceInfo()); MyServiceConnection serviceConnection;
pw.println("connected=" + mServiceConnection.isConnected()); synchronized (this) {
serviceConnection = mServiceConnection;
}
pw.println("target service=" + serviceConnection.getBoundServiceInfo());
pw.println("connected=" + serviceConnection.isConnected());
} }
// runs on the handler thread, and expects most of it's methods to be called from that thread // runs on the handler thread, and expects most of it's methods to be called from that thread