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

Commit c981530a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "No need to make non-empty judgment." into main am: b225077f 

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



Change-Id: I929a3a905c579ae5d1cca18765b4832c37c7a25d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d3bef7a b225077f

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

+1 −5
Original line number Original line Diff line number Diff line
@@ -193,13 +193,9 @@ public interface ServiceWatcher { 




        @Override

        @Override

        public String toString() {

        public String toString() {

            if (mComponentName == null) {

                return "none";

            } else {

            return mUid + "/" + mComponentName.flattenToShortString();

            return mUid + "/" + mComponentName.flattenToShortString();

        }

        }

    }

    }

    }





    /**

    /**

     * Creates a new ServiceWatcher instance.

     * Creates a new ServiceWatcher instance.