commit d3c246c403476e9782eb65744c115201cbf9b948
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jan 13 10:56:31 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 13 10:56:31 2025 -0800
tree 2d16a9088447189c69eeb8a1280374b623f46faa
parent ca384f867c73ed8192bbca982d0f4b4599f6c6ed
parent 5dc21225c57c74985b741b1565eabafb75cdd2f3

Merge "Adding nullptr check for some framework components" into main

location/java/android/location/Geocoder.java

diff --git a/location/java/android/location/Geocoder.java b/location/java/android/location/Geocoder.java
index cdde7c6..9746dab 100644
--- a/location/java/android/location/Geocoder.java
+++ b/location/java/android/location/Geocoder.java
@@ -83,8 +83,11 @@
      * 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) {