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

Commit 7ec16401 authored by Soonil Nagarkar's avatar Soonil Nagarkar
Browse files

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

Flag: EXEMPT merge

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



Change-Id: I1c0bf98c7b244b83c7f501261c573ce54f2c5101
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f1b14cec c981530a

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

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


        @Override

        public String toString() {

            if (mComponentName == null) {

                return "none";

            } else {

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

        }

    }

    }



    /**

     * Creates a new ServiceWatcher instance.