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

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

Merge "Adding nullptr check for some framework components" into main am: d3c246c4 am: c063a0e7 

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



Change-Id: I54bf5132e157caa0421f3ec300d80ee92dea04a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a1de762 c063a0e7

location/java/android/location/Geocoder.java

+5 −2
Original line number Diff line number Diff line
@@ -83,8 +83,11 @@ public final class Geocoder { 
     * succeed.

     */

    public static boolean isPresent() {

        ILocationManager lm = Objects.requireNonNull(ILocationManager.Stub.asInterface(

                ServiceManager.getService(Context.LOCATION_SERVICE)));

        ILocationManager lm = ILocationManager.Stub.asInterface(

                ServiceManager.getService(Context.LOCATION_SERVICE));

        if (lm == null) {

            return false;

        }

        try {

            return lm.isGeocodeAvailable();

        } catch (RemoteException e) {