Merge "More CDM logging" into sc-dev

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java

@@ -165,6 +165,7 @@ public class DeviceChooserActivity extends Activity {
     protected void onStop() {
         super.onStop();
         if (!isFinishing() && !isChangingConfigurations()) {
+            Log.i(LOG_TAG, "onStop() - cancelling");
             cancel();
         }
     }
@@ -195,7 +196,6 @@ public class DeviceChooserActivity extends Activity {
         titleView.setText(title);
     }
 
-    //TODO put in resources xmls
     private ProgressBar getProgressBar() {
         final ProgressBar progressBar = new ProgressBar(this);
         progressBar.setForegroundGravity(Gravity.CENTER_HORIZONTAL);

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java

@@ -309,7 +309,7 @@ public class DeviceDiscoveryService extends Service {
     }
 
     private void onDeviceLost(@Nullable DeviceFilterPair device) {
-        if (DEBUG) Log.i(LOG_TAG, "Lost device " + device.getDisplayName());
+        Log.i(LOG_TAG, "Lost device " + device.getDisplayName());
         Handler.getMain().sendMessage(obtainMessage(
                 DeviceDiscoveryService::onDeviceLostMainThread, this, device));
     }