From 91ce7d2a476bd04fe525049a37a2f8b2824e9724 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Mon, 5 Jun 2017 13:35:02 -0700
Subject: Update AOSP Dialer source from internal google3 repository at
 cl/158012278.

Test: make, treehugger

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/152373142 (4/06/2017) to cl/158012278 (6/05/2017).

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Change-Id: I4d3f14b5140e2e51bead9497bc118a205b3ebe76
---
 .../calllocation/impl/DownloadMapImageTask.java    |  1 +
 .../incallui/calllocation/impl/LocationHelper.java |  7 ++++++
 .../calllocation/impl/ReverseGeocodeTask.java      |  1 +
 .../calllocation/impl/TrafficStatsTags.java        | 29 ----------------------
 4 files changed, 9 insertions(+), 29 deletions(-)
 delete mode 100644 java/com/android/incallui/calllocation/impl/TrafficStatsTags.java

(limited to 'java/com/android/incallui/calllocation/impl')

diff --git a/java/com/android/incallui/calllocation/impl/DownloadMapImageTask.java b/java/com/android/incallui/calllocation/impl/DownloadMapImageTask.java
index 801b0d35c..b093a1b15 100644
--- a/java/com/android/incallui/calllocation/impl/DownloadMapImageTask.java
+++ b/java/com/android/incallui/calllocation/impl/DownloadMapImageTask.java
@@ -21,6 +21,7 @@ import android.location.Location;
 import android.net.TrafficStats;
 import android.os.AsyncTask;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.constants.TrafficStatsTags;
 import com.android.incallui.calllocation.impl.LocationPresenter.LocationUi;
 import java.io.InputStream;
 import java.lang.ref.WeakReference;
diff --git a/java/com/android/incallui/calllocation/impl/LocationHelper.java b/java/com/android/incallui/calllocation/impl/LocationHelper.java
index 3a1478945..99a759bbb 100644
--- a/java/com/android/incallui/calllocation/impl/LocationHelper.java
+++ b/java/com/android/incallui/calllocation/impl/LocationHelper.java
@@ -24,6 +24,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.IntDef;
 import android.support.annotation.MainThread;
+import android.support.v4.os.UserManagerCompat;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.util.PermissionsUtil;
@@ -87,6 +88,12 @@ public class LocationHelper {
       LogUtil.i("LocationHelper.canGetLocation", "location service is disabled.");
       return false;
     }
+
+    if (!UserManagerCompat.isUserUnlocked(context)) {
+      LogUtil.i("LocationHelper.canGetLocation", "location unavailable in FBE mode.");
+      return false;
+    }
+
     return true;
   }
 
diff --git a/java/com/android/incallui/calllocation/impl/ReverseGeocodeTask.java b/java/com/android/incallui/calllocation/impl/ReverseGeocodeTask.java
index eb5957b05..060ec0b4f 100644
--- a/java/com/android/incallui/calllocation/impl/ReverseGeocodeTask.java
+++ b/java/com/android/incallui/calllocation/impl/ReverseGeocodeTask.java
@@ -20,6 +20,7 @@ import android.location.Location;
 import android.net.TrafficStats;
 import android.os.AsyncTask;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.constants.TrafficStatsTags;
 import com.android.incallui.calllocation.impl.LocationPresenter.LocationUi;
 import java.lang.ref.WeakReference;
 import org.json.JSONArray;
diff --git a/java/com/android/incallui/calllocation/impl/TrafficStatsTags.java b/java/com/android/incallui/calllocation/impl/TrafficStatsTags.java
deleted file mode 100644
index 02cc2e083..000000000
--- a/java/com/android/incallui/calllocation/impl/TrafficStatsTags.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.incallui.calllocation.impl;
-
-/** Constants used for logging */
-public class TrafficStatsTags {
-
-  /**
-   * Must be greater than {@link com.android.contacts.common.util.TrafficStatsTags#TAG_MAX}, to
-   * respect the namespace of the tags in ContactsCommon.
-   */
-  public static final int DOWNLOAD_LOCATION_MAP_TAG = 0xd000;
-
-  public static final int REVERSE_GEOCODE_TAG = 0xd001;
-}
-- 
cgit v1.2.3