commit 80c98eb5fed6febe69a51d719c798c8bbcf47b67
author Tyler Gunn <tgunn@google.com> Thu Nov 10 23:32:27 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 10 23:32:33 2016 +0000
tree 33da2594e2046cd3864fdd5b2b2ee012dc8d4513
parent 83e882836bea5ae11f21dd619dd9ae3a2e0c12e3
parent a0a43d51041c9efbe04f7c65236c9e90c3e79346

Merge "Perform camera permission and app ops check when setting camera for VT."

src/com/android/server/telecom/Analytics.java

diff --git a/src/com/android/server/telecom/Analytics.java b/src/com/android/server/telecom/Analytics.java
index 59c8a9d..c69f4fa 100644
--- a/src/com/android/server/telecom/Analytics.java
+++ b/src/com/android/server/telecom/Analytics.java
@@ -26,6 +26,7 @@
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.IndentingPrintWriter;
+import com.android.server.telecom.nano.TelecomLogClass;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;

tests/src/com/android/server/telecom/tests/AnalyticsTests.java

diff --git a/tests/src/com/android/server/telecom/tests/AnalyticsTests.java b/tests/src/com/android/server/telecom/tests/AnalyticsTests.java
index 3d69ff0..587623a 100644
--- a/tests/src/com/android/server/telecom/tests/AnalyticsTests.java
+++ b/tests/src/com/android/server/telecom/tests/AnalyticsTests.java
@@ -33,7 +33,7 @@
 import com.android.internal.util.IndentingPrintWriter;
 import com.android.server.telecom.Analytics;
 import com.android.server.telecom.LogUtils;
-import com.android.server.telecom.TelecomLogClass;
+import com.android.server.telecom.nano.TelecomLogClass;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;