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

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

Merge "isDeclared handles SecurityException as well" into main am: 3cc0f825... 

Merge "isDeclared handles SecurityException as well" into main am: 3cc0f825 am: b0666451 am: fabc31f0

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



Change-Id: Iec1d0439aa8ea8b6b9b821a1176c8d5281ea2069
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04840de0 fabc31f0

core/java/android/os/ServiceManager.java

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ public final class ServiceManager { 
    public static boolean isDeclared(@NonNull String name) {

        try {

            return getIServiceManager().isDeclared(name);

        } catch (RemoteException e) {

        } catch (RemoteException | SecurityException e) {

            Log.e(TAG, "error in isDeclared", e);

            return false;

        }