aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitalii Tomkiv <vitalit@google.com>2016-09-30 11:27:19 -0700
committerVitalii Tomkiv <vitalit@google.com>2016-09-30 11:42:48 -0700
commit1b1247b5648975dd41ee73c25425825abb256234 (patch)
treed8a667d9ffd3105062c50982ff1723c4a2274831
parent5d873a0ab1f5d97a13709d0e663540425a25befb (diff)
downloadCar-1b1247b5648975dd41ee73c25425825abb256234.tar.gz
Change logging for car packages.
Removed PII information. Disable all debug logging by default. bug: 31811554 Test: manual build. Change-Id: If95a27a1bb514f79f2acd65c21f5e7b29345a361
-rw-r--r--car-lib/api/system-current.txt4
-rw-r--r--car-lib/src/android/car/hardware/CarVendorExtensionManager.java2
-rw-r--r--car-lib/src/android/car/hardware/cabin/CarCabinManager.java2
-rw-r--r--car-lib/src/android/car/hardware/camera/CarCameraManager.java4
-rw-r--r--car-lib/src/android/car/hardware/hvac/CarHvacManager.java2
-rw-r--r--car-lib/src/android/car/hardware/property/CarPropertyManagerBase.java2
-rw-r--r--car-lib/src/android/car/hardware/radio/CarRadioManager.java4
-rw-r--r--car-support-lib/src/android/support/car/ui/CarLayoutManager.java2
-rw-r--r--car-support-lib/src/android/support/car/ui/CircularClipAnimation.java2
-rw-r--r--service/src/com/android/car/AppFocusService.java2
-rw-r--r--service/src/com/android/car/CarAudioService.java4
-rw-r--r--service/src/com/android/car/CarCabinService.java4
-rw-r--r--service/src/com/android/car/CarHvacService.java4
-rw-r--r--service/src/com/android/car/CarInputService.java1
-rw-r--r--service/src/com/android/car/CarRadioService.java2
-rw-r--r--service/src/com/android/car/CarVendorExtensionService.java2
-rw-r--r--service/src/com/android/car/CarVolumeControllerFactory.java2
-rw-r--r--service/src/com/android/car/GarageModeService.java2
-rw-r--r--service/src/com/android/car/SystemActivityMonitoringService.java2
-rw-r--r--service/src/com/android/car/cluster/InstrumentClusterService.java2
-rw-r--r--service/src/com/android/car/hal/AudioHalService.java2
-rw-r--r--service/src/com/android/car/hal/CabinHalService.java2
-rw-r--r--service/src/com/android/car/hal/HvacHalService.java2
-rw-r--r--service/src/com/android/car/hal/RadioHalService.java2
-rw-r--r--service/src/com/android/car/hal/VehicleHal.java2
-rw-r--r--service/src/com/android/car/hal/VendorExtensionHalService.java2
-rw-r--r--service/src/com/android/car/pm/CarPackageManagerService.java4
27 files changed, 33 insertions, 34 deletions
diff --git a/car-lib/api/system-current.txt b/car-lib/api/system-current.txt
index b2607df137..3e162c31ac 100644
--- a/car-lib/api/system-current.txt
+++ b/car-lib/api/system-current.txt
@@ -669,8 +669,6 @@ package android.car.hardware.camera {
field public static final int CAMERA_POSITIONING_SUPPORT_FLAG = 4; // 0x4
field public static final int CAR_CAMERA_TYPE_NONE = 0; // 0x0
field public static final int CAR_CAMERA_TYPE_RVC = 1; // 0x1
- field public static final boolean DBG = true;
- field public static final java.lang.String TAG;
}
public class CarCameraState implements android.os.Parcelable {
@@ -761,8 +759,6 @@ package android.car.hardware.radio {
method public synchronized void registerListener(android.car.hardware.radio.CarRadioManager.CarRadioEventListener) throws android.car.CarNotConnectedException;
method public boolean setPreset(android.car.hardware.radio.CarRadioPreset) throws android.car.CarNotConnectedException, java.lang.IllegalArgumentException;
method public synchronized void unregisterListener() throws android.car.CarNotConnectedException;
- field public static final boolean DBG = true;
- field public static final java.lang.String TAG = "CarRadioManager";
}
public static abstract interface CarRadioManager.CarRadioEventListener {
diff --git a/car-lib/src/android/car/hardware/CarVendorExtensionManager.java b/car-lib/src/android/car/hardware/CarVendorExtensionManager.java
index 20f2e6367e..2c5ea0e5bc 100644
--- a/car-lib/src/android/car/hardware/CarVendorExtensionManager.java
+++ b/car-lib/src/android/car/hardware/CarVendorExtensionManager.java
@@ -41,7 +41,7 @@ import java.util.List;
@SystemApi
public class CarVendorExtensionManager implements CarManagerBase {
- private final static boolean DBG = true;
+ private final static boolean DBG = false;
private final static String TAG = CarVendorExtensionManager.class.getSimpleName();
private final CarPropertyManagerBase mPropertyManager;
diff --git a/car-lib/src/android/car/hardware/cabin/CarCabinManager.java b/car-lib/src/android/car/hardware/cabin/CarCabinManager.java
index cac1de184f..2b667594c0 100644
--- a/car-lib/src/android/car/hardware/cabin/CarCabinManager.java
+++ b/car-lib/src/android/car/hardware/cabin/CarCabinManager.java
@@ -41,7 +41,7 @@ import java.util.List;
*/
@SystemApi
public class CarCabinManager implements CarManagerBase {
- private final static boolean DBG = true;
+ private final static boolean DBG = false;
private final static String TAG = "CarCabinManager";
private final CarPropertyManagerBase mMgr;
private final ArraySet<CarCabinEventListener> mListeners = new ArraySet<>();
diff --git a/car-lib/src/android/car/hardware/camera/CarCameraManager.java b/car-lib/src/android/car/hardware/camera/CarCameraManager.java
index f835cc191e..fd06e5968e 100644
--- a/car-lib/src/android/car/hardware/camera/CarCameraManager.java
+++ b/car-lib/src/android/car/hardware/camera/CarCameraManager.java
@@ -31,8 +31,8 @@ import android.util.Log;
*/
@SystemApi
public class CarCameraManager implements CarManagerBase {
- public final static boolean DBG = true;
- public final static String TAG = CarCameraManager.class.getSimpleName();
+ private final static boolean DBG = false;
+ private final static String TAG = CarCameraManager.class.getSimpleName();
// Camera capabilities flags
public static final int ANDROID_OVERLAY_SUPPORT_FLAG = 0x1;
diff --git a/car-lib/src/android/car/hardware/hvac/CarHvacManager.java b/car-lib/src/android/car/hardware/hvac/CarHvacManager.java
index ca35b4f941..49227decf3 100644
--- a/car-lib/src/android/car/hardware/hvac/CarHvacManager.java
+++ b/car-lib/src/android/car/hardware/hvac/CarHvacManager.java
@@ -41,7 +41,7 @@ import java.util.List;
*/
@SystemApi
public class CarHvacManager implements CarManagerBase {
- private final static boolean DBG = true;
+ private final static boolean DBG = false;
private final static String TAG = "CarHvacManager";
private final CarPropertyManagerBase mMgr;
private final ArraySet<CarHvacEventListener> mListeners = new ArraySet<>();
diff --git a/car-lib/src/android/car/hardware/property/CarPropertyManagerBase.java b/car-lib/src/android/car/hardware/property/CarPropertyManagerBase.java
index d1fac03c2c..9240e98f99 100644
--- a/car-lib/src/android/car/hardware/property/CarPropertyManagerBase.java
+++ b/car-lib/src/android/car/hardware/property/CarPropertyManagerBase.java
@@ -158,7 +158,7 @@ public class CarPropertyManagerBase {
try {
return mService.getPropertyList();
} catch (RemoteException e) {
- Log.w(mTag, "Exception in getPropertyList", e);
+ Log.e(mTag, "Exception in getPropertyList", e);
throw new CarNotConnectedException(e);
}
}
diff --git a/car-lib/src/android/car/hardware/radio/CarRadioManager.java b/car-lib/src/android/car/hardware/radio/CarRadioManager.java
index d570f0d6f9..57c49d3339 100644
--- a/car-lib/src/android/car/hardware/radio/CarRadioManager.java
+++ b/car-lib/src/android/car/hardware/radio/CarRadioManager.java
@@ -43,8 +43,8 @@ import java.lang.ref.WeakReference;
*/
@SystemApi
public class CarRadioManager implements CarManagerBase {
- public final static boolean DBG = true;
- public final static String TAG = "CarRadioManager";
+ private final static boolean DBG = false;
+ private final static String TAG = "CarRadioManager";
// Constants handled in the handler (see mHandler below).
private final static int MSG_RADIO_EVENT = 0;
diff --git a/car-support-lib/src/android/support/car/ui/CarLayoutManager.java b/car-support-lib/src/android/support/car/ui/CarLayoutManager.java
index 48711443ad..0c069b0bf3 100644
--- a/car-support-lib/src/android/support/car/ui/CarLayoutManager.java
+++ b/car-support-lib/src/android/support/car/ui/CarLayoutManager.java
@@ -54,7 +54,7 @@ import java.util.ArrayList;
*/
public class CarLayoutManager extends RecyclerView.LayoutManager {
private static final String TAG = "CarLayoutManager";
- private static final boolean DEBUG = true;
+ private static final boolean DEBUG = false;
/**
* Any fling below the threshold will just scroll to the top fully visible row. The units is
diff --git a/car-support-lib/src/android/support/car/ui/CircularClipAnimation.java b/car-support-lib/src/android/support/car/ui/CircularClipAnimation.java
index dbe4cfc55d..4952720478 100644
--- a/car-support-lib/src/android/support/car/ui/CircularClipAnimation.java
+++ b/car-support-lib/src/android/support/car/ui/CircularClipAnimation.java
@@ -41,7 +41,7 @@ import java.util.List;
*/
public class CircularClipAnimation
implements ValueAnimator.AnimatorUpdateListener, Animator.AnimatorListener {
- private static final boolean DBG = true;
+ private static final boolean DBG = false;
private static final String TAG = "CircularClipAnimation";
public static final int DURATION_MS = 300;
diff --git a/service/src/com/android/car/AppFocusService.java b/service/src/com/android/car/AppFocusService.java
index e4725530ee..d7f9c3e815 100644
--- a/service/src/com/android/car/AppFocusService.java
+++ b/service/src/com/android/car/AppFocusService.java
@@ -40,7 +40,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
*/
public class AppFocusService extends IAppFocus.Stub implements CarServiceBase,
BinderInterfaceContainer.BinderEventHandler<IAppFocusOwnershipListener> {
- private static final boolean DBG = true;
+ private static final boolean DBG = false;
private static final boolean DBG_EVENT = false;
private final SystemActivityMonitoringService mSystemActivityMonitoringService;
diff --git a/service/src/com/android/car/CarAudioService.java b/service/src/com/android/car/CarAudioService.java
index 1fd5908913..e4ad5dbe3d 100644
--- a/service/src/com/android/car/CarAudioService.java
+++ b/service/src/com/android/car/CarAudioService.java
@@ -74,8 +74,8 @@ public class CarAudioService extends ICarAudio.Stub implements CarServiceBase,
private static final String TAG_FOCUS = CarLog.TAG_AUDIO + ".FOCUS";
- private static final boolean DBG = true;
- private static final boolean DBG_DYNAMIC_AUDIO_ROUTING = true;
+ private static final boolean DBG = false;
+ private static final boolean DBG_DYNAMIC_AUDIO_ROUTING = false;
/**
* For no focus play case, wait this much to send focus request. This ugly time is necessary
diff --git a/service/src/com/android/car/CarCabinService.java b/service/src/com/android/car/CarCabinService.java
index a7809a32eb..47aaa761f6 100644
--- a/service/src/com/android/car/CarCabinService.java
+++ b/service/src/com/android/car/CarCabinService.java
@@ -22,8 +22,10 @@ import com.android.car.CarLog;
import com.android.car.hal.VehicleHal;
public class CarCabinService extends CarPropertyServiceBase {
+ private final static boolean DBG = false;
+
public CarCabinService(Context context) {
- super(context, VehicleHal.getInstance().getCabinHal(), Car.PERMISSION_CAR_CABIN, true,
+ super(context, VehicleHal.getInstance().getCabinHal(), Car.PERMISSION_CAR_CABIN, DBG,
CarLog.TAG_CABIN);
}
}
diff --git a/service/src/com/android/car/CarHvacService.java b/service/src/com/android/car/CarHvacService.java
index 9ac1816753..99745ee4e8 100644
--- a/service/src/com/android/car/CarHvacService.java
+++ b/service/src/com/android/car/CarHvacService.java
@@ -21,8 +21,10 @@ import android.content.Context;
import com.android.car.hal.VehicleHal;
public class CarHvacService extends CarPropertyServiceBase {
+ private final static boolean DBG = false;
+
public CarHvacService(Context context) {
- super(context, VehicleHal.getInstance().getHvacHal(), Car.PERMISSION_CAR_HVAC, true,
+ super(context, VehicleHal.getInstance().getHvacHal(), Car.PERMISSION_CAR_HVAC, DBG,
CarLog.TAG_HVAC);
}
}
diff --git a/service/src/com/android/car/CarInputService.java b/service/src/com/android/car/CarInputService.java
index 8664c1bbcc..c186e42a76 100644
--- a/service/src/com/android/car/CarInputService.java
+++ b/service/src/com/android/car/CarInputService.java
@@ -220,7 +220,6 @@ public class CarInputService implements CarServiceBase, InputHalService.InputLis
Log.i(CarLog.TAG_INPUT, "call key, dialing last call");
String lastNumber = Calls.getLastOutgoingCall(mContext);
- Log.d(CarLog.TAG_INPUT, "Last number dialed: " + lastNumber);
if (lastNumber != null && !lastNumber.isEmpty()) {
Intent callLastNumberIntent = new Intent(Intent.ACTION_CALL)
.setData(Uri.fromParts("tel", lastNumber, null))
diff --git a/service/src/com/android/car/CarRadioService.java b/service/src/com/android/car/CarRadioService.java
index 3e5e6df3b6..c59983c85e 100644
--- a/service/src/com/android/car/CarRadioService.java
+++ b/service/src/com/android/car/CarRadioService.java
@@ -36,7 +36,7 @@ import java.util.HashMap;
public class CarRadioService extends ICarRadio.Stub
implements CarServiceBase, RadioHalService.RadioListener {
- public static boolean DBG = true;
+ public static boolean DBG = false;
public static String TAG = CarLog.TAG_RADIO + ".CarRadioService";
private RadioHalService mRadioHal;
diff --git a/service/src/com/android/car/CarVendorExtensionService.java b/service/src/com/android/car/CarVendorExtensionService.java
index e4112e2656..38086848a0 100644
--- a/service/src/com/android/car/CarVendorExtensionService.java
+++ b/service/src/com/android/car/CarVendorExtensionService.java
@@ -26,7 +26,7 @@ import com.android.car.hal.VehicleHal;
*/
public class CarVendorExtensionService extends CarPropertyServiceBase {
- private final static boolean DEBUG = true;
+ private final static boolean DEBUG = false;
public CarVendorExtensionService(Context context) {
super(context, VehicleHal.getInstance().getVendorExtensionHal(),
diff --git a/service/src/com/android/car/CarVolumeControllerFactory.java b/service/src/com/android/car/CarVolumeControllerFactory.java
index c26efa2303..8ad9fef8ba 100644
--- a/service/src/com/android/car/CarVolumeControllerFactory.java
+++ b/service/src/com/android/car/CarVolumeControllerFactory.java
@@ -47,7 +47,7 @@ import java.util.Map;
*/
public class CarVolumeControllerFactory {
// STOPSHIP if true.
- private static final boolean DBG = true;
+ private static final boolean DBG = false;
public static CarVolumeController createCarVolumeController(Context context,
CarAudioService audioService, AudioHalService audioHal, CarInputService inputService) {
diff --git a/service/src/com/android/car/GarageModeService.java b/service/src/com/android/car/GarageModeService.java
index 4e1073f969..92f25ea15e 100644
--- a/service/src/com/android/car/GarageModeService.java
+++ b/service/src/com/android/car/GarageModeService.java
@@ -54,7 +54,7 @@ public class GarageModeService implements CarServiceBase,
CarPowerManagementService.PowerServiceEventListener,
DeviceIdleControllerWrapper.DeviceMaintenanceActivityListener {
private static String TAG = "GarageModeService";
- private static final boolean DBG = true;
+ private static final boolean DBG = false;
private static final int MSG_EXIT_GARAGE_MODE_EARLY = 0;
private static final int MSG_WRITE_TO_PREF = 1;
diff --git a/service/src/com/android/car/SystemActivityMonitoringService.java b/service/src/com/android/car/SystemActivityMonitoringService.java
index f647993a1e..aa888305c4 100644
--- a/service/src/com/android/car/SystemActivityMonitoringService.java
+++ b/service/src/com/android/car/SystemActivityMonitoringService.java
@@ -84,7 +84,7 @@ public class SystemActivityMonitoringService implements CarServiceBase {
void onActivityLaunch(TopTaskInfoContainer topTask);
}
- private static final boolean DBG = true;
+ private static final boolean DBG = false;
private static final int NUM_MAX_TASK_TO_FETCH = 10;
diff --git a/service/src/com/android/car/cluster/InstrumentClusterService.java b/service/src/com/android/car/cluster/InstrumentClusterService.java
index 425c65f146..0373f06ae4 100644
--- a/service/src/com/android/car/cluster/InstrumentClusterService.java
+++ b/service/src/com/android/car/cluster/InstrumentClusterService.java
@@ -51,7 +51,7 @@ public class InstrumentClusterService implements CarServiceBase,
FocusOwnershipListener, KeyEventListener {
private static final String TAG = CarLog.TAG_CLUSTER;
- private static final Boolean DBG = true;
+ private static final Boolean DBG = false;
private final Context mContext;
private final AppFocusService mAppFocusService;
diff --git a/service/src/com/android/car/hal/AudioHalService.java b/service/src/com/android/car/hal/AudioHalService.java
index 0756e68407..c4ce31b877 100644
--- a/service/src/com/android/car/hal/AudioHalService.java
+++ b/service/src/com/android/car/hal/AudioHalService.java
@@ -171,7 +171,7 @@ public class AudioHalService extends HalServiceBase {
void onVolumeLimitChange(int streamNumber, int volume);
}
- private static final boolean DBG = true;
+ private static final boolean DBG = false;
private final VehicleHal mVehicleHal;
private AudioHalFocusListener mFocusListener;
diff --git a/service/src/com/android/car/hal/CabinHalService.java b/service/src/com/android/car/hal/CabinHalService.java
index a94bb5e2c1..e6b07d1b5a 100644
--- a/service/src/com/android/car/hal/CabinHalService.java
+++ b/service/src/com/android/car/hal/CabinHalService.java
@@ -20,7 +20,7 @@ import android.car.hardware.cabin.CarCabinManager.CabinPropertyId;
import com.android.car.vehiclenetwork.VehicleNetworkConsts;
public class CabinHalService extends PropertyHalServiceBase {
- private static final boolean DBG = true;
+ private static final boolean DBG = false;
private static final String TAG = "CAR.CABIN.HAL";
private final ManagerToHalPropIdMap mMgrHalPropIdMap = ManagerToHalPropIdMap.create(new int[] {
diff --git a/service/src/com/android/car/hal/HvacHalService.java b/service/src/com/android/car/hal/HvacHalService.java
index 6cf997bac2..c6a565528e 100644
--- a/service/src/com/android/car/hal/HvacHalService.java
+++ b/service/src/com/android/car/hal/HvacHalService.java
@@ -20,7 +20,7 @@ import android.car.hardware.hvac.CarHvacManager.HvacPropertyId;
import com.android.car.vehiclenetwork.VehicleNetworkConsts;
public class HvacHalService extends PropertyHalServiceBase {
- private static final boolean DBG = true;
+ private static final boolean DBG = false;
private static final String TAG = "HvacHalService";
private final ManagerToHalPropIdMap mMgrHalPropIdMap = ManagerToHalPropIdMap.create(new int[] {
diff --git a/service/src/com/android/car/hal/RadioHalService.java b/service/src/com/android/car/hal/RadioHalService.java
index cb52ae473c..68423d0495 100644
--- a/service/src/com/android/car/hal/RadioHalService.java
+++ b/service/src/com/android/car/hal/RadioHalService.java
@@ -40,7 +40,7 @@ import java.io.PrintWriter;
* covered under RadioManager API.
*/
public class RadioHalService extends HalServiceBase {
- public static boolean DBG = true;
+ public static boolean DBG = false;
public static String TAG = CarLog.TAG_HAL + ".RadioHalService";
private int mPresetCount = 0;
diff --git a/service/src/com/android/car/hal/VehicleHal.java b/service/src/com/android/car/hal/VehicleHal.java
index 5c58e4498c..84ee7bef72 100644
--- a/service/src/com/android/car/hal/VehicleHal.java
+++ b/service/src/com/android/car/hal/VehicleHal.java
@@ -49,7 +49,7 @@ import java.util.List;
*/
public class VehicleHal implements VehicleNetworkListener {
- private static final boolean DBG = true;
+ private static final boolean DBG = false;
static {
createInstance();
diff --git a/service/src/com/android/car/hal/VendorExtensionHalService.java b/service/src/com/android/car/hal/VendorExtensionHalService.java
index e04d8aab68..adcc754687 100644
--- a/service/src/com/android/car/hal/VendorExtensionHalService.java
+++ b/service/src/com/android/car/hal/VendorExtensionHalService.java
@@ -25,7 +25,7 @@ import com.android.car.vehiclenetwork.VehiclePropValueUtil;
/*package*/ class VendorExtensionHalService extends PropertyHalServiceBase {
private final static String TAG = VendorExtensionHalService.class.getSimpleName();
- private final static boolean DEBUG = true;
+ private final static boolean DEBUG = false;
VendorExtensionHalService(VehicleHal vehicleHal) {
super(vehicleHal, TAG, DEBUG);
diff --git a/service/src/com/android/car/pm/CarPackageManagerService.java b/service/src/com/android/car/pm/CarPackageManagerService.java
index e9298d472d..0eda83c3c2 100644
--- a/service/src/com/android/car/pm/CarPackageManagerService.java
+++ b/service/src/com/android/car/pm/CarPackageManagerService.java
@@ -64,9 +64,9 @@ import java.util.Set;
//TODO monitor app installing and refresh policy
public class CarPackageManagerService extends ICarPackageManager.Stub implements CarServiceBase {
- static final boolean DBG_POLICY_SET = true;
+ static final boolean DBG_POLICY_SET = false;
static final boolean DBG_POLICY_CHECK = false;
- static final boolean DBG_POLICY_ENFORCEMENT = true;
+ static final boolean DBG_POLICY_ENFORCEMENT = false;
private final Context mContext;
private final SystemActivityMonitoringService mSystemActivityMonitoringService;