Merge "Change logging message control from prebuilt to dynamic"
diff --git a/src/com/android/nfc/BeamShareActivity.java b/src/com/android/nfc/BeamShareActivity.java
index 37e8d1d..9a01918 100644
--- a/src/com/android/nfc/BeamShareActivity.java
+++ b/src/com/android/nfc/BeamShareActivity.java
@@ -35,6 +35,7 @@
import android.nfc.NdefRecord;
import android.nfc.NfcAdapter;
import android.os.Bundle;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.RemoteException;
import android.util.Log;
@@ -57,7 +58,7 @@
*/
public class BeamShareActivity extends Activity {
static final String TAG ="BeamShareActivity";
- static final boolean DBG = false;
+ static final boolean DBG = SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
ArrayList<Uri> mUris;
NdefMessage mNdefMessage;
diff --git a/src/com/android/nfc/ForegroundUtils.java b/src/com/android/nfc/ForegroundUtils.java
index 48d7b88..c106824 100644
--- a/src/com/android/nfc/ForegroundUtils.java
+++ b/src/com/android/nfc/ForegroundUtils.java
@@ -22,12 +22,13 @@
import android.app.IActivityManager;
import android.app.IProcessObserver;
import android.os.RemoteException;
+import android.os.SystemProperties;
import android.util.Log;
import android.util.SparseArray;
import android.util.SparseBooleanArray;
public class ForegroundUtils extends IProcessObserver.Stub {
- static final boolean DBG = false;
+ static final boolean DBG = SystemProperties.getBoolean("persist.nfc.debug_enabled", false);;
private final String TAG = "ForegroundUtils";
private final IActivityManager mIActivityManager;
diff --git a/src/com/android/nfc/NfcDispatcher.java b/src/com/android/nfc/NfcDispatcher.java
index be3e6de..5770b6d 100644
--- a/src/com/android/nfc/NfcDispatcher.java
+++ b/src/com/android/nfc/NfcDispatcher.java
@@ -55,6 +55,7 @@
import android.os.Messenger;
import android.os.Process;
import android.os.RemoteException;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.util.Log;
import android.util.proto.ProtoOutputStream;
@@ -78,7 +79,8 @@
* Dispatch of NFC events to start activities
*/
class NfcDispatcher {
- private static final boolean DBG = false;
+ private static final boolean DBG =
+ SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
private static final String TAG = "NfcDispatcher";
static final int DISPATCH_SUCCESS = 1;
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 6da5c6e..466fd75 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -119,7 +119,7 @@
import java.util.stream.Collectors;
public class NfcService implements DeviceHostListener {
- static final boolean DBG = false;
+ static final boolean DBG = SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
static final String TAG = "NfcService";
public static final String SERVICE_NAME = "nfc";
diff --git a/src/com/android/nfc/RegisteredComponentCache.java b/src/com/android/nfc/RegisteredComponentCache.java
index 8d73317..8e0a3aa 100644
--- a/src/com/android/nfc/RegisteredComponentCache.java
+++ b/src/com/android/nfc/RegisteredComponentCache.java
@@ -30,6 +30,7 @@
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.util.Log;
@@ -43,7 +44,8 @@
*/
public class RegisteredComponentCache {
private static final String TAG = "RegisteredComponentCache";
- private static final boolean DEBUG = false;
+ private static final boolean DEBUG =
+ SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
final Context mContext;
final String mAction;
diff --git a/src/com/android/nfc/beam/BeamManager.java b/src/com/android/nfc/beam/BeamManager.java
index cf5f334..f1ec836 100644
--- a/src/com/android/nfc/beam/BeamManager.java
+++ b/src/com/android/nfc/beam/BeamManager.java
@@ -27,6 +27,7 @@
import android.os.Looper;
import android.os.Message;
import android.os.Messenger;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.util.Log;
@@ -36,7 +37,8 @@
*/
public class BeamManager implements Handler.Callback {
private static final String TAG = "BeamManager";
- private static final boolean DBG = false;
+ private static final boolean DBG =
+ SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
private static final String ACTION_WHITELIST_DEVICE =
"android.btopp.intent.action.WHITELIST_DEVICE";
diff --git a/src/com/android/nfc/cardemulation/AidRoutingManager.java b/src/com/android/nfc/cardemulation/AidRoutingManager.java
index 3dc9f57..c1c1bc1 100644
--- a/src/com/android/nfc/cardemulation/AidRoutingManager.java
+++ b/src/com/android/nfc/cardemulation/AidRoutingManager.java
@@ -15,6 +15,7 @@
*/
package com.android.nfc.cardemulation;
+import android.os.SystemProperties;
import android.util.Log;
import android.util.SparseArray;
import android.util.proto.ProtoOutputStream;
@@ -34,7 +35,7 @@
static final String TAG = "AidRoutingManager";
- static final boolean DBG = false;
+ static final boolean DBG = SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
static final int ROUTE_HOST = 0x00;
diff --git a/src/com/android/nfc/cardemulation/CardEmulationManager.java b/src/com/android/nfc/cardemulation/CardEmulationManager.java
index f635394..a2fee53 100644
--- a/src/com/android/nfc/cardemulation/CardEmulationManager.java
+++ b/src/com/android/nfc/cardemulation/CardEmulationManager.java
@@ -36,6 +36,7 @@
import android.os.UserHandle;
import android.os.PowerManager;
import android.os.SystemClock;
+import android.os.SystemProperties;
import android.provider.Settings;
import android.util.Log;
import android.util.proto.ProtoOutputStream;
@@ -64,7 +65,7 @@
RegisteredNfcFServicesCache.Callback, PreferredServices.Callback,
EnabledNfcFServices.Callback {
static final String TAG = "CardEmulationManager";
- static final boolean DBG = false;
+ static final boolean DBG = SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
static final int NFC_HCE_APDU = 0x01;
static final int NFC_HCE_NFCF = 0x04;
diff --git a/src/com/android/nfc/cardemulation/EnabledNfcFServices.java b/src/com/android/nfc/cardemulation/EnabledNfcFServices.java
index 0e7edbe..fefd54d 100644
--- a/src/com/android/nfc/cardemulation/EnabledNfcFServices.java
+++ b/src/com/android/nfc/cardemulation/EnabledNfcFServices.java
@@ -26,12 +26,13 @@
import android.nfc.cardemulation.NfcFServiceInfo;
import android.os.Handler;
import android.os.Looper;
+import android.os.SystemProperties;
import android.util.Log;
import android.util.proto.ProtoOutputStream;
public class EnabledNfcFServices implements com.android.nfc.ForegroundUtils.Callback {
static final String TAG = "EnabledNfcFCardEmulationServices";
- static final boolean DBG = false;
+ static final boolean DBG = SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
final Context mContext;
final RegisteredNfcFServicesCache mNfcFServiceCache;
diff --git a/src/com/android/nfc/cardemulation/HostEmulationManager.java b/src/com/android/nfc/cardemulation/HostEmulationManager.java
index e26f6f2..c00f150 100644
--- a/src/com/android/nfc/cardemulation/HostEmulationManager.java
+++ b/src/com/android/nfc/cardemulation/HostEmulationManager.java
@@ -33,6 +33,7 @@
import android.os.Messenger;
import android.os.PowerManager;
import android.os.RemoteException;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.util.Log;
import android.util.proto.ProtoOutputStream;
@@ -46,7 +47,7 @@
public class HostEmulationManager {
static final String TAG = "HostEmulationManager";
- static final boolean DBG = false;
+ static final boolean DBG = SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
static final int STATE_IDLE = 0;
static final int STATE_W4_SELECT = 1;
diff --git a/src/com/android/nfc/cardemulation/HostNfcFEmulationManager.java b/src/com/android/nfc/cardemulation/HostNfcFEmulationManager.java
index e2f8554..84123a4 100644
--- a/src/com/android/nfc/cardemulation/HostNfcFEmulationManager.java
+++ b/src/com/android/nfc/cardemulation/HostNfcFEmulationManager.java
@@ -28,6 +28,7 @@
import android.os.Message;
import android.os.Messenger;
import android.os.RemoteException;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.util.Log;
import android.util.proto.ProtoOutputStream;
@@ -39,7 +40,7 @@
public class HostNfcFEmulationManager {
static final String TAG = "HostNfcFEmulationManager";
- static final boolean DBG = false;
+ static final boolean DBG = SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
static final int STATE_IDLE = 0;
static final int STATE_W4_SERVICE = 1;
diff --git a/src/com/android/nfc/cardemulation/PreferredServices.java b/src/com/android/nfc/cardemulation/PreferredServices.java
index 7b0a6e6..533ae96 100644
--- a/src/com/android/nfc/cardemulation/PreferredServices.java
+++ b/src/com/android/nfc/cardemulation/PreferredServices.java
@@ -31,6 +31,7 @@
import android.nfc.cardemulation.CardEmulation;
import android.os.Handler;
import android.os.Looper;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings;
import android.provider.Settings.SettingNotFoundException;
@@ -55,7 +56,7 @@
*/
public class PreferredServices implements com.android.nfc.ForegroundUtils.Callback {
static final String TAG = "PreferredCardEmulationServices";
- static final boolean DBG = false;
+ static final boolean DBG = SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
static final Uri paymentDefaultUri = Settings.Secure.getUriFor(
Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT);
static final Uri paymentForegroundUri = Settings.Secure.getUriFor(
diff --git a/src/com/android/nfc/cardemulation/RegisteredAidCache.java b/src/com/android/nfc/cardemulation/RegisteredAidCache.java
index 2e66e3c..b4a18bb 100644
--- a/src/com/android/nfc/cardemulation/RegisteredAidCache.java
+++ b/src/com/android/nfc/cardemulation/RegisteredAidCache.java
@@ -21,6 +21,7 @@
import android.content.Context;
import android.nfc.cardemulation.ApduServiceInfo;
import android.nfc.cardemulation.CardEmulation;
+import android.os.SystemProperties;
import android.util.Log;
import android.util.proto.ProtoOutputStream;
@@ -42,7 +43,7 @@
public class RegisteredAidCache {
static final String TAG = "RegisteredAidCache";
- static final boolean DBG = false;
+ static final boolean DBG = SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
static final int AID_ROUTE_QUAL_SUBSET = 0x20;
static final int AID_ROUTE_QUAL_PREFIX = 0x10;
diff --git a/src/com/android/nfc/cardemulation/RegisteredNfcFServicesCache.java b/src/com/android/nfc/cardemulation/RegisteredNfcFServicesCache.java
index a89f370..d46b5a2 100644
--- a/src/com/android/nfc/cardemulation/RegisteredNfcFServicesCache.java
+++ b/src/com/android/nfc/cardemulation/RegisteredNfcFServicesCache.java
@@ -33,6 +33,7 @@
import android.nfc.cardemulation.NfcFServiceInfo;
import android.nfc.cardemulation.NfcFCardEmulation;
import android.nfc.cardemulation.HostNfcFService;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.util.AtomicFile;
import android.util.Log;
@@ -61,7 +62,7 @@
public class RegisteredNfcFServicesCache {
static final String XML_INDENT_OUTPUT_FEATURE = "http://xmlpull.org/v1/doc/features.html#indent-output";
static final String TAG = "RegisteredNfcFServicesCache";
- static final boolean DBG = false;
+ static final boolean DBG = SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
final Context mContext;
final AtomicReference<BroadcastReceiver> mReceiver;
diff --git a/src/com/android/nfc/cardemulation/RegisteredServicesCache.java b/src/com/android/nfc/cardemulation/RegisteredServicesCache.java
index 2f0d898..b3a59b7 100644
--- a/src/com/android/nfc/cardemulation/RegisteredServicesCache.java
+++ b/src/com/android/nfc/cardemulation/RegisteredServicesCache.java
@@ -35,6 +35,7 @@
import android.nfc.cardemulation.CardEmulation;
import android.nfc.cardemulation.HostApduService;
import android.nfc.cardemulation.OffHostApduService;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.util.AtomicFile;
import android.util.Log;
@@ -69,7 +70,7 @@
public class RegisteredServicesCache {
static final String XML_INDENT_OUTPUT_FEATURE = "http://xmlpull.org/v1/doc/features.html#indent-output";
static final String TAG = "RegisteredServicesCache";
- static final boolean DEBUG = false;
+ static final boolean DEBUG = SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
final Context mContext;
final AtomicReference<BroadcastReceiver> mReceiver;
diff --git a/src/com/android/nfc/cardemulation/RegisteredT3tIdentifiersCache.java b/src/com/android/nfc/cardemulation/RegisteredT3tIdentifiersCache.java
index f24ee69..701448e 100644
--- a/src/com/android/nfc/cardemulation/RegisteredT3tIdentifiersCache.java
+++ b/src/com/android/nfc/cardemulation/RegisteredT3tIdentifiersCache.java
@@ -20,6 +20,7 @@
import android.content.ComponentName;
import android.content.Context;
import android.nfc.cardemulation.NfcFServiceInfo;
+import android.os.SystemProperties;
import android.util.Log;
import android.util.proto.ProtoOutputStream;
@@ -34,7 +35,7 @@
public class RegisteredT3tIdentifiersCache {
static final String TAG = "RegisteredT3tIdentifiersCache";
- static final boolean DBG = false;
+ static final boolean DBG = SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
// All NFC-F services that have registered
List<NfcFServiceInfo> mServices = new ArrayList<NfcFServiceInfo>();
diff --git a/src/com/android/nfc/cardemulation/SystemCodeRoutingManager.java b/src/com/android/nfc/cardemulation/SystemCodeRoutingManager.java
index eb8c9cb..b5c82ac 100644
--- a/src/com/android/nfc/cardemulation/SystemCodeRoutingManager.java
+++ b/src/com/android/nfc/cardemulation/SystemCodeRoutingManager.java
@@ -16,6 +16,7 @@
package com.android.nfc.cardemulation;
+import android.os.SystemProperties;
import android.util.Log;
import android.util.proto.ProtoOutputStream;
@@ -30,7 +31,7 @@
public class SystemCodeRoutingManager {
static final String TAG = "SystemCodeRoutingManager";
- static final boolean DBG = false;
+ static final boolean DBG = SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
final Object mLock = new Object();
diff --git a/src/com/android/nfc/handover/BluetoothPeripheralHandover.java b/src/com/android/nfc/handover/BluetoothPeripheralHandover.java
index 45b00ae..3d9d865 100644
--- a/src/com/android/nfc/handover/BluetoothPeripheralHandover.java
+++ b/src/com/android/nfc/handover/BluetoothPeripheralHandover.java
@@ -36,6 +36,7 @@
import android.os.Looper;
import android.os.Message;
import android.os.ParcelUuid;
+import android.os.SystemProperties;
import android.provider.Settings;
import android.util.Log;
import android.view.KeyEvent;
@@ -55,7 +56,7 @@
*/
public class BluetoothPeripheralHandover implements BluetoothProfile.ServiceListener {
static final String TAG = "BluetoothPeripheralHandover";
- static final boolean DBG = false;
+ static final boolean DBG = SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
static final String ACTION_ALLOW_CONNECT = "com.android.nfc.handover.action.ALLOW_CONNECT";
static final String ACTION_DENY_CONNECT = "com.android.nfc.handover.action.DENY_CONNECT";
diff --git a/src/com/android/nfc/handover/HandoverClient.java b/src/com/android/nfc/handover/HandoverClient.java
index 20e4ef6..19e9c80 100644
--- a/src/com/android/nfc/handover/HandoverClient.java
+++ b/src/com/android/nfc/handover/HandoverClient.java
@@ -17,6 +17,7 @@
import android.nfc.FormatException;
import android.nfc.NdefMessage;
+import android.os.SystemProperties;
import android.util.Log;
import com.android.nfc.LlcpException;
@@ -30,7 +31,8 @@
public final class HandoverClient {
private static final String TAG = "HandoverClient";
private static final int MIU = 128;
- private static final boolean DBG = false;
+ private static final boolean DBG =
+ SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
private static final int DISCONNECTED = 0;
private static final int CONNECTING = 1;
diff --git a/src/com/android/nfc/handover/HandoverDataParser.java b/src/com/android/nfc/handover/HandoverDataParser.java
index 0e04fdf..9cf8075 100644
--- a/src/com/android/nfc/handover/HandoverDataParser.java
+++ b/src/com/android/nfc/handover/HandoverDataParser.java
@@ -27,6 +27,7 @@
import android.nfc.NdefMessage;
import android.nfc.NdefRecord;
import android.os.ParcelUuid;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.util.Log;
import java.nio.BufferUnderflowException;
@@ -43,7 +44,8 @@
*/
public class HandoverDataParser {
private static final String TAG = "NfcHandover";
- private static final boolean DBG = false;
+ private static final boolean DBG =
+ SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
private static final byte[] TYPE_BT_OOB = "application/vnd.bluetooth.ep.oob"
.getBytes(StandardCharsets.US_ASCII);
diff --git a/src/com/android/nfc/handover/HandoverServer.java b/src/com/android/nfc/handover/HandoverServer.java
index c2b4153..ffd7616 100644
--- a/src/com/android/nfc/handover/HandoverServer.java
+++ b/src/com/android/nfc/handover/HandoverServer.java
@@ -28,6 +28,7 @@
import android.content.Intent;
import android.nfc.FormatException;
import android.nfc.NdefMessage;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.util.Log;
@@ -38,7 +39,7 @@
public final class HandoverServer {
static final String HANDOVER_SERVICE_NAME = "urn:nfc:sn:handover";
static final String TAG = "HandoverServer";
- static final Boolean DBG = false;
+ static final Boolean DBG = SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
static final int MIU = 128;
diff --git a/src/com/android/nfc/snep/SnepClient.java b/src/com/android/nfc/snep/SnepClient.java
index 03824cc..4aa6715 100644
--- a/src/com/android/nfc/snep/SnepClient.java
+++ b/src/com/android/nfc/snep/SnepClient.java
@@ -21,13 +21,15 @@
import com.android.nfc.NfcService;
import android.nfc.NdefMessage;
+import android.os.SystemProperties;
import android.util.Log;
import java.io.IOException;
public final class SnepClient {
private static final String TAG = "SnepClient";
- private static final boolean DBG = false;
+ private static final boolean DBG =
+ SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
private static final int DEFAULT_ACCEPTABLE_LENGTH = 100*1024;
private static final int DEFAULT_MIU = 128;
private static final int DEFAULT_RWSIZE = 1;
diff --git a/src/com/android/nfc/snep/SnepMessenger.java b/src/com/android/nfc/snep/SnepMessenger.java
index 51ebe03..0d5dade 100644
--- a/src/com/android/nfc/snep/SnepMessenger.java
+++ b/src/com/android/nfc/snep/SnepMessenger.java
@@ -22,6 +22,7 @@
import com.android.nfc.sneptest.ExtDtaSnepServer;
import android.nfc.FormatException;
+import android.os.SystemProperties;
import android.util.Log;
import java.io.ByteArrayInputStream;
@@ -32,7 +33,8 @@
public class SnepMessenger {
private static final String TAG = "SnepMessager";
- private static final boolean DBG = false;
+ private static final boolean DBG =
+ SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
private static final int HEADER_LENGTH = 6;
final LlcpSocket mSocket;
final int mFragmentLength;
diff --git a/src/com/android/nfc/snep/SnepServer.java b/src/com/android/nfc/snep/SnepServer.java
index 33b6406..a06f4c0 100644
--- a/src/com/android/nfc/snep/SnepServer.java
+++ b/src/com/android/nfc/snep/SnepServer.java
@@ -23,6 +23,7 @@
import android.nfc.NdefMessage;
import android.nfc.NfcAdapter;
+import android.os.SystemProperties;
import android.util.Log;
import java.io.IOException;
@@ -33,7 +34,8 @@
*/
public final class SnepServer {
private static final String TAG = "SnepServer";
- private static final boolean DBG = false;
+ private static final boolean DBG =
+ SystemProperties.getBoolean("persist.nfc.debug_enabled", false);
private static final int DEFAULT_MIU = 248;
private static final int DEFAULT_RW_SIZE = 1;
