Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 654b38c9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixup lint errors in ServiceWatcher" into sc-dev am: 3878ef82 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13971375

Change-Id: I2a23f941bc03fed0cba9c3131544359dfac12f3c
parents 49724488 3878ef82

services/core/java/com/android/server/servicewatcher/ServiceWatcher.java

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ public interface ServiceWatcher { 
            if (this == o) {

                return true;

            }

            if (o == null || getClass() != o.getClass()) {

            if (!(o instanceof BoundServiceInfo)) {

                return false;

            }

services/core/java/com/android/server/servicewatcher/ServiceWatcherImpl.java

+13 −3
Original line number Diff line number Diff line
@@ -147,13 +147,23 @@ class ServiceWatcherImpl<TBoundServiceInfo extends BoundServiceInfo> implements 


    @Override

    public String toString() {

        return mServiceConnection.getBoundServiceInfo().toString();

        MyServiceConnection serviceConnection;

        synchronized (this) {

            serviceConnection = mServiceConnection;

        }



        return serviceConnection.getBoundServiceInfo().toString();

    }



    @Override

    public void dump(PrintWriter pw) {

        pw.println("target service=" + mServiceConnection.getBoundServiceInfo());

        pw.println("connected=" + mServiceConnection.isConnected());

        MyServiceConnection serviceConnection;

        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