Leave commented out internal location utils.

PiperOrigin-RevId: 254797601
Change-Id: I4b70eeb0b0db491bacd51b230b77a506125ec4dd

1 files changed, 14 insertions, 7 deletions

diff --git a/common/src/com/android/tv/common/util/LocationUtils.java b/common/src/com/android/tv/common/util/LocationUtils.java
index 60c2a969..9d44cf21 100644
--- a/common/src/com/android/tv/common/util/LocationUtils.java
+++ b/common/src/com/android/tv/common/util/LocationUtils.java
@@ -16,9 +16,7 @@
 
 package com.android.tv.common.util;
 
-import android.Manifest;
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.location.Address;
 import android.location.Geocoder;
 import android.location.Location;
@@ -32,11 +30,6 @@ import android.util.Log;
 
 import com.android.tv.common.BuildConfig;
 
-
-
-
-
-
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashSet;
@@ -69,6 +62,13 @@ public class LocationUtils {
         if (sApplicationContext == null) {
             sApplicationContext = context.getApplicationContext();
         }
+        /* Begin_AOSP_Comment_Out
+        if (!BuildConfig.AOSP) {
+            com.google.android.tv.livechannels.util.GoogleLocationUtilsHelper.startLocationUpdates(
+                    context, LocationUtils::updateAddress);
+            return null;
+        }
+        End_AOSP_Comment_Out */
         LocationUtilsHelper.startLocationUpdates();
         return null;
     }
@@ -127,6 +127,13 @@ public class LocationUtils {
         if (sCountry != null) {
             return sCountry;
         }
+        /* Begin_AOSP_Comment_Out
+        if (!BuildConfig.AOSP) {
+            sCountry =
+                    com.google.android.tv.livechannels.util.GoogleLocationUtilsHelper
+                            .getDeviceCountry(context);
+        }
+        End_AOSP_Comment_Out */
         if (TextUtils.isEmpty(sCountry)) {
             sCountry = context.getResources().getConfiguration().locale.getCountry();
         }