DO NOT MERGE Clean up logs in CarAssistUtils
Change-Id: Ia3525a744ee53a28af099262d9b2bcd51f081e58
Fix: 131437256
Test: manual
diff --git a/car-assist-client-lib/src/com/android/car/assist/client/CarAssistUtils.java b/car-assist-client-lib/src/com/android/car/assist/client/CarAssistUtils.java
index 66bbd7e..e7f0db0 100644
--- a/car-assist-client-lib/src/com/android/car/assist/client/CarAssistUtils.java
+++ b/car-assist-client-lib/src/com/android/car/assist/client/CarAssistUtils.java
@@ -82,21 +82,19 @@
.flattenToString();
int slashIndex = activeComponent.indexOf("/");
final String activePackage = activeComponent.substring(0, slashIndex);
- // TODO: remove this log
- Log.d(TAG, "assistantIsNotificationListener: activeComponent: " + activeComponent
- + " activePackage: " + activePackage + " context user: "
- + mContext.getContentResolver().getUserId() + " current user "
- + ActivityManager.getCurrentUser());
final String listeners = Settings.Secure.getStringForUser(mContext.getContentResolver(),
Settings.Secure.ENABLED_NOTIFICATION_LISTENERS, ActivityManager.getCurrentUser());
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.d(TAG, "Current user: " + ActivityManager.getCurrentUser()
+ + " has active voice service: " + activePackage + " and enabled notification "
+ + " listeners: " + listeners);
+ }
+
if (listeners != null) {
- // TODO: remove this log
- Log.d(TAG, " Listeners are: " + listeners);
for (String listener : Arrays.asList(listeners.split(":"))) {
if (listener.contains(activePackage)) {
- Log.d(TAG, "Active assistant has notification listener: " + listener);
return true;
}
}
@@ -231,7 +229,6 @@
* @return true if the read request was handled successfully
*/
private boolean readMessageNotification(StatusBarNotification sbn) {
- Log.i(TAG, " in readMessageNotification");
return requestAction(BundleBuilder.buildAssistantReadBundle(sbn))
|| mFallbackAssistant.handleReadAction(sbn);
}
@@ -253,10 +250,12 @@
if (assistantIsNotificationListener()) {
if (mAssistUtils.showSessionForActiveService(payloadArguments,
CarVoiceInteractionSession.SHOW_SOURCE_NOTIFICATION, null, null)) {
- Log.d(TAG, " Successfully showed session, returning true");
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.d(TAG, " Successfully showed session, returning true");
+ }
return true;
} else {
- Log.d(TAG, "Session could not be shown for active service");
+ Log.w(TAG, "Session could not be shown for active service");
}
}
return false;