[Script] Add @Override annotations to overriden methods

* Run "Missing @Override annotation" inspection in Intellij and perform
  automatic fixes

Bug: 63597465
Test: make checkbuild, no manual changes, no functional changes
Change-Id: I3607581a0538ecce382dbb68742f40662bca6cad

52 files changed, 418 insertions, 0 deletions

diff --git a/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapEmailProvider.java b/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapEmailProvider.java
index 0f10cdd61..a4ee66e6f 100644
--- a/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapEmailProvider.java
+++ b/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapEmailProvider.java
@@ -178,6 +178,7 @@ public abstract class BluetoothMapEmailProvider extends ContentProvider {
          * Generate a message based on the cursor, and write the encoded data to the stream.
          */
 
+        @Override
         public void writeDataToPipe(ParcelFileDescriptor output, Uri uri, String mimeType,
                 Bundle opts, Cursor c) {
             if (D) Log.d(TAG, "writeDataToPipe(): uri=" + uri.toString() +
diff --git a/src/com/android/bluetooth/BluetoothObexTransport.java b/src/com/android/bluetooth/BluetoothObexTransport.java
index 216ced204..bcf88a122 100644
--- a/src/com/android/bluetooth/BluetoothObexTransport.java
+++ b/src/com/android/bluetooth/BluetoothObexTransport.java
@@ -36,35 +36,44 @@ public class BluetoothObexTransport implements ObexTransport {
         this.mSocket = socket;
     }
 
+    @Override
     public void close() throws IOException {
         mSocket.close();
     }
 
+    @Override
     public DataInputStream openDataInputStream() throws IOException {
         return new DataInputStream(openInputStream());
     }
 
+    @Override
     public DataOutputStream openDataOutputStream() throws IOException {
         return new DataOutputStream(openOutputStream());
     }
 
+    @Override
     public InputStream openInputStream() throws IOException {
         return mSocket.getInputStream();
     }
 
+    @Override
     public OutputStream openOutputStream() throws IOException {
         return mSocket.getOutputStream();
     }
 
+    @Override
     public void connect() throws IOException {
     }
 
+    @Override
     public void create() throws IOException {
     }
 
+    @Override
     public void disconnect() throws IOException {
     }
 
+    @Override
     public void listen() throws IOException {
     }
 
@@ -72,6 +81,7 @@ public class BluetoothObexTransport implements ObexTransport {
         return true;
     }
 
+    @Override
     public int getMaxTransmitPacketSize() {
         if (mSocket.getConnectionType() != BluetoothSocket.TYPE_L2CAP) {
            return -1;
@@ -79,6 +89,7 @@ public class BluetoothObexTransport implements ObexTransport {
         return mSocket.getMaxTransmitPacketSize();
     }
 
+    @Override
     public int getMaxReceivePacketSize() {
         if (mSocket.getConnectionType() != BluetoothSocket.TYPE_L2CAP) {
             return -1;
diff --git a/src/com/android/bluetooth/a2dp/A2dpService.java b/src/com/android/bluetooth/a2dp/A2dpService.java
index bdab866fc..577f2af17 100755
--- a/src/com/android/bluetooth/a2dp/A2dpService.java
+++ b/src/com/android/bluetooth/a2dp/A2dpService.java
@@ -98,14 +98,17 @@ public class A2dpService extends ProfileService {
         BluetoothUuid.AudioSink
     };
 
+    @Override
     protected String getName() {
         return TAG;
     }
 
+    @Override
     protected IProfileServiceBinder initBinder() {
         return new BluetoothA2dpBinder(this);
     }
 
+    @Override
     protected boolean start() {
         mAvrcp = Avrcp.make(this);
         mStateMachine = A2dpStateMachine.make(this, this);
@@ -119,6 +122,7 @@ public class A2dpService extends ProfileService {
         return true;
     }
 
+    @Override
     protected boolean stop() {
         if (mStateMachine != null) {
             mStateMachine.doQuit();
@@ -129,6 +133,7 @@ public class A2dpService extends ProfileService {
         return true;
     }
 
+    @Override
     protected boolean cleanup() {
         if (mConnectionStateChangedReceiver != null) {
             unregisterReceiver(mConnectionStateChangedReceiver);
@@ -365,95 +370,111 @@ public class A2dpService extends ProfileService {
             mService = svc;
         }
 
+        @Override
         public boolean cleanup()  {
             mService = null;
             return true;
         }
 
+        @Override
         public boolean connect(BluetoothDevice device) {
             A2dpService service = getService();
             if (service == null) return false;
             return service.connect(device);
         }
 
+        @Override
         public boolean disconnect(BluetoothDevice device) {
             A2dpService service = getService();
             if (service == null) return false;
             return service.disconnect(device);
         }
 
+        @Override
         public List<BluetoothDevice> getConnectedDevices() {
             A2dpService service = getService();
             if (service == null) return new ArrayList<BluetoothDevice>(0);
             return service.getConnectedDevices();
         }
 
+        @Override
         public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
             A2dpService service = getService();
             if (service == null) return new ArrayList<BluetoothDevice>(0);
             return service.getDevicesMatchingConnectionStates(states);
         }
 
+        @Override
         public int getConnectionState(BluetoothDevice device) {
             A2dpService service = getService();
             if (service == null) return BluetoothProfile.STATE_DISCONNECTED;
             return service.getConnectionState(device);
         }
 
+        @Override
         public boolean setPriority(BluetoothDevice device, int priority) {
             A2dpService service = getService();
             if (service == null) return false;
             return service.setPriority(device, priority);
         }
 
+        @Override
         public int getPriority(BluetoothDevice device) {
             A2dpService service = getService();
             if (service == null) return BluetoothProfile.PRIORITY_UNDEFINED;
             return service.getPriority(device);
         }
 
+        @Override
         public boolean isAvrcpAbsoluteVolumeSupported() {
             A2dpService service = getService();
             if (service == null) return false;
             return service.isAvrcpAbsoluteVolumeSupported();
         }
 
+        @Override
         public void adjustAvrcpAbsoluteVolume(int direction) {
             A2dpService service = getService();
             if (service == null) return;
             service.adjustAvrcpAbsoluteVolume(direction);
         }
 
+        @Override
         public void setAvrcpAbsoluteVolume(int volume) {
             A2dpService service = getService();
             if (service == null) return;
             service.setAvrcpAbsoluteVolume(volume);
         }
 
+        @Override
         public boolean isA2dpPlaying(BluetoothDevice device) {
             A2dpService service = getService();
             if (service == null) return false;
             return service.isA2dpPlaying(device);
         }
 
+        @Override
         public BluetoothCodecStatus getCodecStatus() {
             A2dpService service = getService();
             if (service == null) return null;
             return service.getCodecStatus();
         }
 
+        @Override
         public void setCodecConfigPreference(BluetoothCodecConfig codecConfig) {
             A2dpService service = getService();
             if (service == null) return;
             service.setCodecConfigPreference(codecConfig);
         }
 
+        @Override
         public void enableOptionalCodecs() {
             A2dpService service = getService();
             if (service == null) return;
             service.enableOptionalCodecs();
         }
 
+        @Override
         public void disableOptionalCodecs() {
             A2dpService service = getService();
             if (service == null) return;
diff --git a/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java b/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java
index a7426e906..826fe5631 100644
--- a/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java
+++ b/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java
@@ -44,14 +44,17 @@ public class A2dpSinkService extends ProfileService {
     private A2dpSinkStateMachine mStateMachine;
     private static A2dpSinkService sA2dpSinkService;
 
+    @Override
     protected String getName() {
         return TAG;
     }
 
+    @Override
     protected IProfileServiceBinder initBinder() {
         return new BluetoothA2dpSinkBinder(this);
     }
 
+    @Override
     protected boolean start() {
         if (DBG) {
             Log.d(TAG, "start()");
@@ -64,6 +67,7 @@ public class A2dpSinkService extends ProfileService {
         return true;
     }
 
+    @Override
     protected boolean stop() {
         if (DBG) {
             Log.d(TAG, "stop()");
@@ -76,6 +80,7 @@ public class A2dpSinkService extends ProfileService {
         return true;
     }
 
+    @Override
     protected boolean cleanup() {
         if (mStateMachine!= null) {
             mStateMachine.cleanup();
@@ -260,59 +265,69 @@ public class A2dpSinkService extends ProfileService {
             mService = svc;
         }
 
+        @Override
         public boolean cleanup()  {
             mService = null;
             return true;
         }
 
+        @Override
         public boolean connect(BluetoothDevice device) {
             A2dpSinkService service = getService();
             if (service == null) return false;
             return service.connect(device);
         }
 
+        @Override
         public boolean disconnect(BluetoothDevice device) {
             A2dpSinkService service = getService();
             if (service == null) return false;
             return service.disconnect(device);
         }
 
+        @Override
         public List<BluetoothDevice> getConnectedDevices() {
             A2dpSinkService service = getService();
             if (service == null) return new ArrayList<BluetoothDevice>(0);
             return service.getConnectedDevices();
         }
 
+        @Override
         public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
             A2dpSinkService service = getService();
             if (service == null) return new ArrayList<BluetoothDevice>(0);
             return service.getDevicesMatchingConnectionStates(states);
         }
 
+        @Override
         public int getConnectionState(BluetoothDevice device) {
             A2dpSinkService service = getService();
             if (service == null) return BluetoothProfile.STATE_DISCONNECTED;
             return service.getConnectionState(device);
         }
 
+        @Override
         public boolean isA2dpPlaying(BluetoothDevice device) {
             A2dpSinkService service = getService();
             if (service == null) return false;
             return service.isA2dpPlaying(device);
         }
 
+        @Override
         public boolean setPriority(BluetoothDevice device, int priority) {
             A2dpSinkService service = getService();
             if (service == null) return false;
             return service.setPriority(device, priority);
         }
 
+        @Override
         public int getPriority(BluetoothDevice device) {
             A2dpSinkService service = getService();
             if (service == null) return BluetoothProfile.PRIORITY_UNDEFINED;
             return service.getPriority(device);
         }
 
+        @Override
         public BluetoothAudioConfig getAudioConfig(BluetoothDevice device) {
             A2dpSinkService service = getService();
             if (service == null) return null;
diff --git a/src/com/android/bluetooth/a2dpsink/A2dpSinkStreamHandler.java b/src/com/android/bluetooth/a2dpsink/A2dpSinkStreamHandler.java
index bb9ac12eb..a565c2e8d 100644
--- a/src/com/android/bluetooth/a2dpsink/A2dpSinkStreamHandler.java
+++ b/src/com/android/bluetooth/a2dpsink/A2dpSinkStreamHandler.java
@@ -84,6 +84,7 @@ public class A2dpSinkStreamHandler extends Handler {
 
     // Focus changes when we are currently holding focus.
     private OnAudioFocusChangeListener mAudioFocusListener = new OnAudioFocusChangeListener() {
+        @Override
         public void onAudioFocusChange(int focusChange) {
             if (DBG) {
                 Log.d(TAG, "onAudioFocusChangeListener focuschange " + focusChange);
diff --git a/src/com/android/bluetooth/avrcp/Avrcp.java b/src/com/android/bluetooth/avrcp/Avrcp.java
index 4bf7c908a..e302a6571 100644
--- a/src/com/android/bluetooth/avrcp/Avrcp.java
+++ b/src/com/android/bluetooth/avrcp/Avrcp.java
@@ -220,6 +220,7 @@ public final class Avrcp {
             return true;
         }
 
+        @Override
         public String toString() {
             StringBuilder sb = new StringBuilder();
             sb.append(android.text.format.DateFormat.format("MM-dd HH:mm:ss", mTimeSent));
@@ -1001,6 +1002,7 @@ public final class Avrcp {
             return s == null ? new String() : s.toString();
         }
 
+        @Override
         public String toString() {
             if (!exists) {
                 return "[MediaAttributes: none]";
@@ -2500,12 +2502,14 @@ public final class Avrcp {
     private class AvrcpMediaRsp implements AvrcpMediaRspInterface {
         private static final String TAG = "AvrcpMediaRsp";
 
+        @Override
         public void setAddrPlayerRsp(byte[] address, int rspStatus) {
             if (!setAddressedPlayerRspNative(address, rspStatus)) {
                 Log.e(TAG, "setAddrPlayerRsp failed!");
             }
         }
 
+        @Override
         public void setBrowsedPlayerRsp(byte[] address, int rspStatus, byte depth, int numItems,
                 String[] textArray) {
             if (!setBrowsedPlayerRspNative(address, rspStatus, depth, numItems, textArray)) {
@@ -2513,6 +2517,7 @@ public final class Avrcp {
             }
         }
 
+        @Override
         public void mediaPlayerListRsp(byte[] address, int rspStatus, MediaPlayerListRsp rspObj) {
             if (rspObj != null && rspStatus == AvrcpConstants.RSP_NO_ERROR) {
                 if (!mediaPlayerListRspNative(address, rspStatus, sUIDCounter, rspObj.itemType,
@@ -2528,6 +2533,7 @@ public final class Avrcp {
             }
         }
 
+        @Override
         public void folderItemsRsp(byte[] address, int rspStatus, FolderItemsRsp rspObj) {
             if (rspObj != null && rspStatus == AvrcpConstants.RSP_NO_ERROR) {
                 if (!getFolderItemsRspNative(address, rspStatus, sUIDCounter, rspObj.mScope,
@@ -2544,11 +2550,13 @@ public final class Avrcp {
 
         }
 
+        @Override
         public void changePathRsp(byte[] address, int rspStatus, int numItems) {
             if (!changePathRspNative(address, rspStatus, numItems))
                 Log.e(TAG, "changePathRspNative failed!");
         }
 
+        @Override
         public void getItemAttrRsp(byte[] address, int rspStatus, ItemAttrRsp rspObj) {
             if (rspObj != null && rspStatus == AvrcpConstants.RSP_NO_ERROR) {
                 if (!getItemAttrRspNative(address, rspStatus, rspObj.mNumAttr,
@@ -2561,12 +2569,14 @@ public final class Avrcp {
             }
         }
 
+        @Override
         public void playItemRsp(byte[] address, int rspStatus) {
             if (!playItemRspNative(address, rspStatus)) {
                 Log.e(TAG, "playItemRspNative failed!");
             }
         }
 
+        @Override
         public void getTotalNumOfItemsRsp(byte[] address, int rspStatus, int uidCounter,
                 int numItems) {
             if (!getTotalNumOfItemsRspNative(address, rspStatus, sUIDCounter, numItems)) {
@@ -2574,24 +2584,28 @@ public final class Avrcp {
             }
         }
 
+        @Override
         public void addrPlayerChangedRsp(int type, int playerId, int uidCounter) {
             if (!registerNotificationRspAddrPlayerChangedNative(type, playerId, sUIDCounter)) {
                 Log.e(TAG, "registerNotificationRspAddrPlayerChangedNative failed!");
             }
         }
 
+        @Override
         public void avalPlayerChangedRsp(byte[] address, int type) {
             if (!registerNotificationRspAvalPlayerChangedNative(type)) {
                 Log.e(TAG, "registerNotificationRspAvalPlayerChangedNative failed!");
             }
         }
 
+        @Override
         public void uidsChangedRsp(int type) {
             if (!registerNotificationRspUIDsChangedNative(type, sUIDCounter)) {
                 Log.e(TAG, "registerNotificationRspUIDsChangedNative failed!");
             }
         }
 
+        @Override
         public void nowPlayingChangedRsp(int type) {
             if (mNowPlayingListChangedNT != AvrcpConstants.NOTIFICATION_TYPE_INTERIM) {
                 if (DEBUG) Log.d(TAG, "NowPlayingListChanged: Not registered or requesting.");
@@ -2604,6 +2618,7 @@ public final class Avrcp {
             mNowPlayingListChangedNT = AvrcpConstants.NOTIFICATION_TYPE_CHANGED;
         }
 
+        @Override
         public void trackChangedRsp(int type, byte[] uid) {
             if (!registerNotificationRspTrackChangeNative(type, uid)) {
                 Log.e(TAG, "registerNotificationRspTrackChangeNative failed!");
diff --git a/src/com/android/bluetooth/avrcp/AvrcpHelperClasses.java b/src/com/android/bluetooth/avrcp/AvrcpHelperClasses.java
index 3588219b1..5a5b6a654 100644
--- a/src/com/android/bluetooth/avrcp/AvrcpHelperClasses.java
+++ b/src/com/android/bluetooth/avrcp/AvrcpHelperClasses.java
@@ -56,6 +56,7 @@ class AvrcpCmd {
             this.mAttrIDs = attrIds;
         }
 
+        @Override
         public String toString() {
             StringBuilder sb = new StringBuilder();
             sb.append("[FolderItemCmd: scope " + mScope);
@@ -88,6 +89,7 @@ class AvrcpCmd {
             mAttrIDs = attrIDs;
         }
 
+        @Override
         public String toString() {
             StringBuilder sb = new StringBuilder();
             sb.append("[ItemAttrCmd: scope " + mScope);
diff --git a/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerService.java b/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerService.java
index 8c81ad2f0..921d6cb3e 100644
--- a/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerService.java
+++ b/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerService.java
@@ -209,14 +209,17 @@ public class AvrcpControllerService extends ProfileService {
         initNative();
     }
 
+    @Override
     protected String getName() {
         return TAG;
     }
 
+    @Override
     protected IProfileServiceBinder initBinder() {
         return new BluetoothAvrcpControllerBinder(this);
     }
 
+    @Override
     protected boolean start() {
         HandlerThread thread = new HandlerThread("BluetoothAvrcpHandler");
         thread.start();
@@ -227,6 +230,7 @@ public class AvrcpControllerService extends ProfileService {
         return true;
     }
 
+    @Override
     protected boolean stop() {
         if (mAvrcpCtSm != null) {
             mAvrcpCtSm.doQuit();
@@ -659,6 +663,7 @@ public class AvrcpControllerService extends ProfileService {
             mService = svc;
         }
 
+        @Override
         public boolean cleanup() {
             mService = null;
             return true;
diff --git a/src/com/android/bluetooth/avrcpcontroller/TrackInfo.java b/src/com/android/bluetooth/avrcpcontroller/TrackInfo.java
index 033ea048f..718c1a389 100644
--- a/src/com/android/bluetooth/avrcpcontroller/TrackInfo.java
+++ b/src/com/android/bluetooth/avrcpcontroller/TrackInfo.java
@@ -91,6 +91,7 @@ class TrackInfo {
         mTrackLen = (attribute != null && !attribute.isEmpty()) ? Long.valueOf(attribute) : TOTAL_TRACK_TIME_INVALID;
     }
 
+    @Override
     public String toString() {
         return "Metadata [artist=" + mArtistName + " trackTitle= " + mTrackTitle +
                 " albumTitle= " + mAlbumTitle + " genre= " +mGenre+" trackNum= "+
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
index 65de16c66..6583b693d 100644
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -445,12 +445,14 @@ public class AdapterService extends Service {
         debugLog("onBind()");
         return mBinder;
     }
+    @Override
     public boolean onUnbind(Intent intent) {
         debugLog("onUnbind() - calling cleanup");
         cleanup();
         return super.onUnbind(intent);
     }
 
+    @Override
     public void onDestroy() {
         debugLog("onDestroy()");
         mProfileObserver.stop();
@@ -772,6 +774,7 @@ public class AdapterService extends Service {
             }
             return null;
         }
+        @Override
         public boolean isEnabled() {
             // don't check caller, may be called from system UI
             AdapterService service = getService();
@@ -779,6 +782,7 @@ public class AdapterService extends Service {
             return service.isEnabled();
         }
 
+        @Override
         public int getState() {
             // don't check caller, may be called from system UI
             AdapterService service = getService();
@@ -786,6 +790,7 @@ public class AdapterService extends Service {
             return service.getState();
         }
 
+        @Override
         public boolean enable() {
             if ((Binder.getCallingUid() != Process.SYSTEM_UID) &&
                 (!Utils.checkCaller())) {
@@ -797,6 +802,7 @@ public class AdapterService extends Service {
             return service.enable();
         }
 
+        @Override
         public boolean enableNoAutoConnect() {
             if ((Binder.getCallingUid() != Process.SYSTEM_UID) &&
                 (!Utils.checkCaller())) {
@@ -809,6 +815,7 @@ public class AdapterService extends Service {
             return service.enableNoAutoConnect();
         }
 
+        @Override
         public boolean disable() {
             if ((Binder.getCallingUid() != Process.SYSTEM_UID) &&
                 (!Utils.checkCaller())) {
@@ -821,6 +828,7 @@ public class AdapterService extends Service {
             return service.disable();
         }
 
+        @Override
         public String getAddress() {
             if ((Binder.getCallingUid() != Process.SYSTEM_UID) &&
                 (!Utils.checkCallerAllowManagedProfiles(mService))) {
@@ -833,6 +841,7 @@ public class AdapterService extends Service {
             return service.getAddress();
         }
 
+        @Override
         public ParcelUuid[] getUuids() {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "getUuids() - Not allowed for non-active user");
@@ -844,6 +853,7 @@ public class AdapterService extends Service {
             return service.getUuids();
         }
 
+        @Override
         public String getName() {
             if ((Binder.getCallingUid() != Process.SYSTEM_UID) &&
                 (!Utils.checkCaller())) {
@@ -856,6 +866,7 @@ public class AdapterService extends Service {
             return service.getName();
         }
 
+        @Override
         public boolean setName(String name) {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "setName() - Not allowed for non-active user");
@@ -878,6 +889,7 @@ public class AdapterService extends Service {
             return service.setBluetoothClass(bluetoothClass);
         }
 
+        @Override
         public int getScanMode() {
             if (!Utils.checkCallerAllowManagedProfiles(mService)) {
                 Log.w(TAG, "getScanMode() - Not allowed for non-active user");
@@ -889,6 +901,7 @@ public class AdapterService extends Service {
             return service.getScanMode();
         }
 
+        @Override
         public boolean setScanMode(int mode, int duration) {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "setScanMode() - Not allowed for non-active user");
@@ -900,6 +913,7 @@ public class AdapterService extends Service {
             return service.setScanMode(mode,duration);
         }
 
+        @Override
         public int getDiscoverableTimeout() {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "getDiscoverableTimeout() - Not allowed for non-active user");
@@ -911,6 +925,7 @@ public class AdapterService extends Service {
             return service.getDiscoverableTimeout();
         }
 
+        @Override
         public boolean setDiscoverableTimeout(int timeout) {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "setDiscoverableTimeout() - Not allowed for non-active user");
@@ -922,6 +937,7 @@ public class AdapterService extends Service {
             return service.setDiscoverableTimeout(timeout);
         }
 
+        @Override
         public boolean startDiscovery() {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "startDiscovery() - Not allowed for non-active user");
@@ -933,6 +949,7 @@ public class AdapterService extends Service {
             return service.startDiscovery();
         }
 
+        @Override
         public boolean cancelDiscovery() {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "cancelDiscovery() - Not allowed for non-active user");
@@ -944,6 +961,7 @@ public class AdapterService extends Service {
             return service.cancelDiscovery();
         }
 
+        @Override
         public boolean isDiscovering() {
             if (!Utils.checkCallerAllowManagedProfiles(mService)) {
                 Log.w(TAG, "isDiscovering() - Not allowed for non-active user");
@@ -955,6 +973,7 @@ public class AdapterService extends Service {
             return service.isDiscovering();
         }
 
+        @Override
         public long getDiscoveryEndMillis() {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "getDiscoveryEndMillis() - Not allowed for non-active user");
@@ -966,6 +985,7 @@ public class AdapterService extends Service {
             return service.getDiscoveryEndMillis();
         }
 
+        @Override
         public BluetoothDevice[] getBondedDevices() {
             // don't check caller, may be called from system UI
             AdapterService service = getService();
@@ -973,6 +993,7 @@ public class AdapterService extends Service {
             return service.getBondedDevices();
         }
 
+        @Override
         public int getAdapterConnectionState() {
             // don't check caller, may be called from system UI
             AdapterService service = getService();
@@ -980,6 +1001,7 @@ public class AdapterService extends Service {
             return service.getAdapterConnectionState();
         }
 
+        @Override
         public int getProfileConnectionState(int profile) {
             if (!Utils.checkCallerAllowManagedProfiles(mService)) {
                 Log.w(TAG, "getProfileConnectionState- Not allowed for non-active user");
@@ -991,6 +1013,7 @@ public class AdapterService extends Service {
             return service.getProfileConnectionState(profile);
         }
 
+        @Override
         public boolean createBond(BluetoothDevice device, int transport) {
             if (!Utils.checkCallerAllowManagedProfiles(mService)) {
                 Log.w(TAG, "createBond() - Not allowed for non-active user");
@@ -1002,6 +1025,7 @@ public class AdapterService extends Service {
             return service.createBond(device, transport, null);
         }
 
+        @Override
         public boolean createBondOutOfBand(BluetoothDevice device, int transport, OobData oobData) {
             if (!Utils.checkCallerAllowManagedProfiles(mService)) {
                 Log.w(TAG, "createBondOutOfBand() - Not allowed for non-active user");
@@ -1013,6 +1037,7 @@ public class AdapterService extends Service {
             return service.createBond(device, transport, oobData);
         }
 
+        @Override
         public boolean cancelBondProcess(BluetoothDevice device) {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "cancelBondProcess() - Not allowed for non-active user");
@@ -1024,6 +1049,7 @@ public class AdapterService extends Service {
             return service.cancelBondProcess(device);
         }
 
+        @Override
         public boolean removeBond(BluetoothDevice device) {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "removeBond() - Not allowed for non-active user");
@@ -1035,6 +1061,7 @@ public class AdapterService extends Service {
             return service.removeBond(device);
         }
 
+        @Override
         public int getBondState(BluetoothDevice device) {
             // don't check caller, may be called from system UI
             AdapterService service = getService();
@@ -1042,6 +1069,7 @@ public class AdapterService extends Service {
             return service.getBondState(device);
         }
 
+        @Override
         public boolean isBondingInitiatedLocally(BluetoothDevice device) {
             // don't check caller, may be called from system UI
             AdapterService service = getService();
@@ -1049,18 +1077,21 @@ public class AdapterService extends Service {
             return service.isBondingInitiatedLocally(device);
         }
 
+        @Override
         public long getSupportedProfiles() {
             AdapterService service = getService();
             if (service == null) return 0;
             return service.getSupportedProfiles();
         }
 
+        @Override
         public int getConnectionState(BluetoothDevice device) {
             AdapterService service = getService();
             if (service == null) return 0;
             return service.getConnectionState(device);
         }
 
+        @Override
         public String getRemoteName(BluetoothDevice device) {
             if (!Utils.checkCallerAllowManagedProfiles(mService)) {
                 Log.w(TAG, "getRemoteName() - Not allowed for non-active user");
@@ -1072,6 +1103,7 @@ public class AdapterService extends Service {
             return service.getRemoteName(device);
         }
 
+        @Override
         public int getRemoteType(BluetoothDevice device) {
             if (!Utils.checkCallerAllowManagedProfiles(mService)) {
                 Log.w(TAG, "getRemoteType() - Not allowed for non-active user");
@@ -1083,6 +1115,7 @@ public class AdapterService extends Service {
             return service.getRemoteType(device);
         }
 
+        @Override
         public String getRemoteAlias(BluetoothDevice device) {
             if (!Utils.checkCallerAllowManagedProfiles(mService)) {
                 Log.w(TAG, "getRemoteAlias() - Not allowed for non-active user");
@@ -1094,6 +1127,7 @@ public class AdapterService extends Service {
             return service.getRemoteAlias(device);
         }
 
+        @Override
         public boolean setRemoteAlias(BluetoothDevice device, String name) {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "setRemoteAlias() - Not allowed for non-active user");
@@ -1105,6 +1139,7 @@ public class AdapterService extends Service {
             return service.setRemoteAlias(device, name);
         }
 
+        @Override
         public int getRemoteClass(BluetoothDevice device) {
             if (!Utils.checkCallerAllowManagedProfiles(mService)) {
                 Log.w(TAG, "getRemoteClass() - Not allowed for non-active user");
@@ -1116,6 +1151,7 @@ public class AdapterService extends Service {
             return service.getRemoteClass(device);
         }
 
+        @Override
         public ParcelUuid[] getRemoteUuids(BluetoothDevice device) {
             if (!Utils.checkCallerAllowManagedProfiles(mService)) {
                 Log.w(TAG, "getRemoteUuids() - Not allowed for non-active user");
@@ -1127,6 +1163,7 @@ public class AdapterService extends Service {
             return service.getRemoteUuids(device);
         }
 
+        @Override
         public boolean fetchRemoteUuids(BluetoothDevice device) {
             if (!Utils.checkCallerAllowManagedProfiles(mService)) {
                 Log.w(TAG, "fetchRemoteUuids() - Not allowed for non-active user");
@@ -1140,6 +1177,7 @@ public class AdapterService extends Service {
 
 
 
+        @Override
         public boolean setPin(BluetoothDevice device, boolean accept, int len, byte[] pinCode) {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "setPin() - Not allowed for non-active user");
@@ -1151,6 +1189,7 @@ public class AdapterService extends Service {
             return service.setPin(device, accept, len, pinCode);
         }
 
+        @Override
         public boolean setPasskey(BluetoothDevice device, boolean accept, int len, byte[] passkey) {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "setPasskey() - Not allowed for non-active user");
@@ -1162,6 +1201,7 @@ public class AdapterService extends Service {
             return service.setPasskey(device, accept, len, passkey);
         }
 
+        @Override
         public boolean setPairingConfirmation(BluetoothDevice device, boolean accept) {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "setPairingConfirmation() - Not allowed for non-active user");
@@ -1173,6 +1213,7 @@ public class AdapterService extends Service {
             return service.setPairingConfirmation(device, accept);
         }
 
+        @Override
         public int getPhonebookAccessPermission(BluetoothDevice device) {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "getPhonebookAccessPermission() - Not allowed for non-active user");
@@ -1184,6 +1225,7 @@ public class AdapterService extends Service {
             return service.getPhonebookAccessPermission(device);
         }
 
+        @Override
         public boolean setPhonebookAccessPermission(BluetoothDevice device, int value) {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "setPhonebookAccessPermission() - Not allowed for non-active user");
@@ -1195,6 +1237,7 @@ public class AdapterService extends Service {
             return service.setPhonebookAccessPermission(device, value);
         }
 
+        @Override
         public int getMessageAccessPermission(BluetoothDevice device) {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "getMessageAccessPermission() - Not allowed for non-active user");
@@ -1206,6 +1249,7 @@ public class AdapterService extends Service {
             return service.getMessageAccessPermission(device);
         }
 
+        @Override
         public boolean setMessageAccessPermission(BluetoothDevice device, int value) {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "setMessageAccessPermission() - Not allowed for non-active user");
@@ -1217,6 +1261,7 @@ public class AdapterService extends Service {
             return service.setMessageAccessPermission(device, value);
         }
 
+        @Override
         public int getSimAccessPermission(BluetoothDevice device) {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "getSimAccessPermission() - Not allowed for non-active user");
@@ -1228,6 +1273,7 @@ public class AdapterService extends Service {
             return service.getSimAccessPermission(device);
         }
 
+        @Override
         public boolean setSimAccessPermission(BluetoothDevice device, int value) {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "setSimAccessPermission() - Not allowed for non-active user");
@@ -1239,6 +1285,7 @@ public class AdapterService extends Service {
             return service.setSimAccessPermission(device, value);
         }
 
+        @Override
         public void sendConnectionStateChange(BluetoothDevice
                 device, int profile, int state, int prevState) {
             AdapterService service = getService();
@@ -1246,6 +1293,7 @@ public class AdapterService extends Service {
             service.sendConnectionStateChange(device, profile, state, prevState);
         }
 
+        @Override
         public ParcelFileDescriptor connectSocket(BluetoothDevice device, int type,
                                                   ParcelUuid uuid, int port, int flag) {
             if (!Utils.checkCallerAllowManagedProfiles(mService)) {
@@ -1258,6 +1306,7 @@ public class AdapterService extends Service {
             return service.connectSocket(device, type, uuid, port, flag);
         }
 
+        @Override
         public ParcelFileDescriptor createSocketChannel(int type, String serviceName,
                                                         ParcelUuid uuid, int port, int flag) {
             if (!Utils.checkCallerAllowManagedProfiles(mService)) {
@@ -1269,6 +1318,7 @@ public class AdapterService extends Service {
             if (service == null) return null;
             return service.createSocketChannel(type, serviceName, uuid, port, flag);
         }
+        @Override
         public boolean sdpSearch(BluetoothDevice device, ParcelUuid uuid) {
             if (!Utils.checkCaller()) {
                 Log.w(TAG,"sdpSea(): not allowed for non-active user");
@@ -1280,6 +1330,7 @@ public class AdapterService extends Service {
             return service.sdpSearch(device,uuid);
         }
 
+        @Override
         public int getBatteryLevel(BluetoothDevice device) {
             if (!Utils.checkCaller()) {
                 Log.w(TAG, "getBatteryLevel(): not allowed for non-active user");
@@ -1291,6 +1342,7 @@ public class AdapterService extends Service {
             return service.getBatteryLevel(device);
         }
 
+        @Override
         public boolean factoryReset() {
             AdapterService service = getService();
             if (service == null) return false;
@@ -1299,24 +1351,28 @@ public class AdapterService extends Service {
 
         }
 
+        @Override
         public void registerCallback(IBluetoothCallback cb) {
             AdapterService service = getService();
             if (service == null) return ;
             service.registerCallback(cb);
          }
 
+         @Override
          public void unregisterCallback(IBluetoothCallback cb) {
              AdapterService service = getService();
              if (service == null) return ;
              service.unregisterCallback(cb);
          }
 
+         @Override
          public boolean isMultiAdvertisementSupported() {
              AdapterService service = getService();
              if (service == null) return false;
              return service.isMultiAdvertisementSupported();
          }
 
+         @Override
          public boolean isOffloadedFilteringSupported() {
              AdapterService service = getService();
              if (service == null) return false;
@@ -1324,6 +1380,7 @@ public class AdapterService extends Service {
              return (val >= MIN_OFFLOADED_FILTERS);
          }
 
+         @Override
          public boolean isOffloadedScanBatchingSupported() {
              AdapterService service = getService();
              if (service == null) return false;
@@ -1331,48 +1388,56 @@ public class AdapterService extends Service {
              return (val >= MIN_OFFLOADED_SCAN_STORAGE_BYTES);
          }
 
+         @Override
          public boolean isLe2MPhySupported() {
              AdapterService service = getService();
              if (service == null) return false;
              return service.isLe2MPhySupported();
          }
 
+         @Override
          public boolean isLeCodedPhySupported() {
              AdapterService service = getService();
              if (service == null) return false;
              return service.isLeCodedPhySupported();
          }
 
+         @Override
          public boolean isLeExtendedAdvertisingSupported() {
              AdapterService service = getService();
              if (service == null) return false;
              return service.isLeExtendedAdvertisingSupported();
          }
 
+         @Override
          public boolean isLePeriodicAdvertisingSupported() {
              AdapterService service = getService();
              if (service == null) return false;
              return service.isLePeriodicAdvertisingSupported();
          }
 
+         @Override
          public int getLeMaximumAdvertisingDataLength() {
              AdapterService service = getService();
              if (service == null) return 0;
              return service.getLeMaximumAdvertisingDataLength();
          }
 
+         @Override
          public boolean isActivityAndEnergyReportingSupported() {
              AdapterService service = getService();
              if (service == null) return false;
              return service.isActivityAndEnergyReportingSupported();
          }
 
+         @Override
          public BluetoothActivityEnergyInfo reportActivityInfo() {
              AdapterService service = getService();
              if (service == null) return null;
              return service.reportActivityInfo();
          }
 
+         @Override
          public void requestActivityInfo(ResultReceiver result) {
              Bundle bundle = new Bundle();
              bundle.putParcelable(BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY,
@@ -1380,18 +1445,21 @@ public class AdapterService extends Service {
              result.send(0, bundle);
          }
 
+        @Override
         public void onLeServiceUp(){
              AdapterService service = getService();
              if (service == null) return;
              service.onLeServiceUp();
          }
 
+         @Override
          public void onBrEdrDown(){
              AdapterService service = getService();
              if (service == null) return;
              service.onBrEdrDown();
          }
 
+         @Override
          public void dump(FileDescriptor fd, String[] args) {
             PrintWriter writer = new PrintWriter(new FileOutputStream(fd));
             AdapterService service = getService();
@@ -2306,6 +2374,7 @@ public class AdapterService extends Service {
     private native void interopDatabaseClearNative();
     private native void interopDatabaseAddNative(int feature, byte[] address, int length);
 
+    @Override
     protected void finalize() {
         debugLog("finalize() - clean up object " + this);
         cleanup();
diff --git a/src/com/android/bluetooth/btservice/AdapterState.java b/src/com/android/bluetooth/btservice/AdapterState.java
index 401281581..b633e7966 100644
--- a/src/com/android/bluetooth/btservice/AdapterState.java
+++ b/src/com/android/bluetooth/btservice/AdapterState.java
@@ -269,6 +269,7 @@ final class AdapterState extends StateMachine {
         private boolean mIsBleTurningOn;
         private boolean mIsBleTurningOff;
 
+        @Override
         public void enter() {
             infoLog("Entering PendingCommandState");
         }
diff --git a/src/com/android/bluetooth/btservice/ProfileService.java b/src/com/android/bluetooth/btservice/ProfileService.java
index cf5387322..b6e2f46a6 100644
--- a/src/com/android/bluetooth/btservice/ProfileService.java
+++ b/src/com/android/bluetooth/btservice/ProfileService.java
@@ -86,6 +86,7 @@ public abstract class ProfileService extends Service {
         }
     }
 
+    @Override
     protected void finalize() {
         if (DBG) {
             synchronized (sReferenceCount) {
@@ -110,6 +111,7 @@ public abstract class ProfileService extends Service {
         create();
     }
 
+    @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         if (DBG) log("onStartCommand()");
         AdapterService adapterService = AdapterService.getAdapterService();
@@ -149,6 +151,7 @@ public abstract class ProfileService extends Service {
         return PROFILE_SERVICE_MODE;
     }
 
+    @Override
     public IBinder onBind(Intent intent) {
         if (DBG) log("onBind");
         if (mAdapter != null && mBinder == null) {
@@ -158,6 +161,7 @@ public abstract class ProfileService extends Service {
         return mBinder;
     }
 
+    @Override
     public boolean onUnbind(Intent intent) {
         if (DBG) log("onUnbind");
         return super.onUnbind(intent);
diff --git a/src/com/android/bluetooth/gatt/GattService.java b/src/com/android/bluetooth/gatt/GattService.java
index e82dc62f5..aaf87f5a0 100644
--- a/src/com/android/bluetooth/gatt/GattService.java
+++ b/src/com/android/bluetooth/gatt/GattService.java
@@ -173,14 +173,17 @@ public class GattService extends ProfileService {
         classInitNative();
     }
 
+    @Override
     protected String getName() {
         return TAG;
     }
 
+    @Override
     protected IProfileServiceBinder initBinder() {
         return new BluetoothGattBinder(this);
     }
 
+    @Override
     protected boolean start() {
         if (DBG) Log.d(TAG, "start()");
         initializeNative();
@@ -197,6 +200,7 @@ public class GattService extends ProfileService {
         return true;
     }
 
+    @Override
     protected boolean stop() {
         if (DBG) Log.d(TAG, "stop()");
         mScannerMap.clear();
@@ -210,6 +214,7 @@ public class GattService extends ProfileService {
         return true;
     }
 
+    @Override
     protected boolean cleanup() {
         if (DBG) Log.d(TAG, "cleanup()");
         cleanupNative();
@@ -310,6 +315,7 @@ public class GattService extends ProfileService {
             mAppIf = appIf;
         }
 
+        @Override
         public void binderDied() {
             if (DBG) Log.d(TAG, "Binder is dead - unregistering server (" + mAppIf + ")!");
             unregisterServer(mAppIf);
@@ -323,6 +329,7 @@ public class GattService extends ProfileService {
             mAppIf = appIf;
         }
 
+        @Override
         public void binderDied() {
             if (DBG) Log.d(TAG, "Binder is dead - unregistering client (" + mAppIf + ")!");
             unregisterClient(mAppIf);
@@ -339,6 +346,7 @@ public class GattService extends ProfileService {
             mService = svc;
         }
 
+        @Override
         public boolean cleanup()  {
             mService = null;
             return true;
@@ -350,24 +358,28 @@ public class GattService extends ProfileService {
             return null;
         }
 
+        @Override
         public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
             GattService service = getService();
             if (service == null) return new ArrayList<BluetoothDevice>();
             return service.getDevicesMatchingConnectionStates(states);
         }
 
+        @Override
         public void registerClient(ParcelUuid uuid, IBluetoothGattCallback callback) {
             GattService service = getService();
             if (service == null) return;
             service.registerClient(uuid.getUuid(), callback);
         }
 
+        @Override
         public void unregisterClient(int clientIf) {
             GattService service = getService();
             if (service == null) return;
             service.unregisterClient(clientIf);
         }
 
+        @Override
         public void registerScanner(IScannerCallback callback, WorkSource workSource)
                 throws RemoteException {
             GattService service = getService();
@@ -375,6 +387,7 @@ public class GattService extends ProfileService {
             service.registerScanner(callback, workSource);
         }
 
+        @Override
         public void unregisterScanner(int scannerId) {
             GattService service = getService();
             if (service == null) return;
@@ -405,6 +418,7 @@ public class GattService extends ProfileService {
             service.stopScan(intent, callingPackage);
         }
 
+        @Override
         public void stopScan(int scannerId) {
             GattService service = getService();
             if (service == null) return;
@@ -448,30 +462,35 @@ public class GattService extends ProfileService {
             service.clientReadPhy(clientIf, address);
         }
 
+        @Override
         public void refreshDevice(int clientIf, String address) {
             GattService service = getService();
             if (service == null) return;
             service.refreshDevice(clientIf, address);
         }
 
+        @Override
         public void discoverServices(int clientIf, String address) {
             GattService service = getService();
             if (service == null) return;
             service.discoverServices(clientIf, address);
         }
 
+        @Override
         public void discoverServiceByUuid(int clientIf, String address, ParcelUuid uuid) {
             GattService service = getService();
             if (service == null) return;
             service.discoverServiceByUuid(clientIf, address, uuid.getUuid());
         }
 
+        @Override
         public void readCharacteristic(int clientIf, String address, int handle, int authReq) {
             GattService service = getService();
             if (service == null) return;
             service.readCharacteristic(clientIf, address, handle, authReq);
         }
 
+        @Override
         public void readUsingCharacteristicUuid(int clientIf, String address, ParcelUuid uuid,
                 int startHandle, int endHandle, int authReq) {
             GattService service = getService();
@@ -480,6 +499,7 @@ public class GattService extends ProfileService {
                     clientIf, address, uuid.getUuid(), startHandle, endHandle, authReq);
         }
 
+        @Override
         public void writeCharacteristic(int clientIf, String address, int handle,
                              int writeType, int authReq, byte[] value) {
             GattService service = getService();
@@ -487,12 +507,14 @@ public class GattService extends ProfileService {
             service.writeCharacteristic(clientIf, address, handle, writeType, authReq, value);
         }
 
+        @Override
         public void readDescriptor(int clientIf, String address, int handle, int authReq) {
             GattService service = getService();
             if (service == null) return;
             service.readDescriptor(clientIf, address, handle, authReq);
         }
 
+        @Override
         public void writeDescriptor(int clientIf, String address, int handle,
                                     int authReq, byte[] value) {
             GattService service = getService();
@@ -500,36 +522,42 @@ public class GattService extends ProfileService {
             service.writeDescriptor(clientIf, address, handle, authReq, value);
         }
 
+        @Override
         public void beginReliableWrite(int clientIf, String address) {
             GattService service = getService();
             if (service == null) return;
             service.beginReliableWrite(clientIf, address);
         }
 
+        @Override
         public void endReliableWrite(int clientIf, String address, boolean execute) {
             GattService service = getService();
             if (service == null) return;
             service.endReliableWrite(clientIf, address, execute);
         }
 
+        @Override
         public void registerForNotification(int clientIf, String address, int handle, boolean enable) {
             GattService service = getService();
             if (service == null) return;
             service.registerForNotification(clientIf, address, handle, enable);
         }
 
+        @Override
         public void readRemoteRssi(int clientIf, String address) {
             GattService service = getService();
             if (service == null) return;
             service.readRemoteRssi(clientIf, address);
         }
 
+        @Override
         public void configureMTU(int clientIf, String address, int mtu) {
             GattService service = getService();
             if (service == null) return;
             service.configureMTU(clientIf, address, mtu);
         }
 
+        @Override
         public void connectionParameterUpdate(int clientIf, String address,
                                               int connectionPriority) {
             GattService service = getService();
@@ -537,30 +565,35 @@ public class GattService extends ProfileService {
             service.connectionParameterUpdate(clientIf, address, connectionPriority);
         }
 
+        @Override
         public void registerServer(ParcelUuid uuid, IBluetoothGattServerCallback callback) {
             GattService service = getService();
             if (service == null) return;
             service.registerServer(uuid.getUuid(), callback);
         }
 
+        @Override
         public void unregisterServer(int serverIf) {
             GattService service = getService();
             if (service == null) return;
             service.unregisterServer(serverIf);
         }
 
+        @Override
         public void serverConnect(int serverIf, String address, boolean isDirect, int transport) {
             GattService service = getService();
             if (service == null) return;
             service.serverConnect(serverIf, address, isDirect, transport);
         }
 
+        @Override
         public void serverDisconnect(int serverIf, String address) {
             GattService service = getService();
             if (service == null) return;
             service.serverDisconnect(serverIf, address);
         }
 
+        @Override
         public void serverSetPreferredPhy(
                 int serverIf, String address, int txPhy, int rxPhy, int phyOptions) {
             GattService service = getService();
@@ -568,12 +601,14 @@ public class GattService extends ProfileService {
             service.serverSetPreferredPhy(serverIf, address, txPhy, rxPhy, phyOptions);
         }
 
+        @Override
         public void serverReadPhy(int clientIf, String address) {
             GattService service = getService();
             if (service == null) return;
             service.serverReadPhy(clientIf, address);
         }
 
+        @Override
         public void addService(int serverIf, BluetoothGattService svc) {
             GattService service = getService();
             if (service == null) return;
@@ -581,18 +616,21 @@ public class GattService extends ProfileService {
             service.addService(serverIf, svc);
         }
 
+        @Override
         public void removeService(int serverIf, int handle) {
             GattService service = getService();
             if (service == null) return;
             service.removeService(serverIf, handle);
         }
 
+        @Override
         public void clearServices(int serverIf) {
             GattService service = getService();
             if (service == null) return;
             service.clearServices(serverIf);
         }
 
+        @Override
         public void sendResponse(int serverIf, String address, int requestId,
                                  int status, int offset, byte[] value) {
             GattService service = getService();
@@ -600,6 +638,7 @@ public class GattService extends ProfileService {
             service.sendResponse(serverIf, address, requestId, status, offset, value);
         }
 
+        @Override
         public void sendNotification(int serverIf, String address, int handle,
                                               boolean confirm, byte[] value) {
             GattService service = getService();
@@ -607,6 +646,7 @@ public class GattService extends ProfileService {
             service.sendNotification(serverIf, address, handle, confirm, value);
         }
 
+        @Override
         public void startAdvertisingSet(AdvertisingSetParameters parameters,
                 AdvertiseData advertiseData, AdvertiseData scanResponse,
                 PeriodicAdvertisingParameters periodicParameters, AdvertiseData periodicData,
@@ -617,18 +657,21 @@ public class GattService extends ProfileService {
                     periodicData, duration, maxExtAdvEvents, callback);
         }
 
+        @Override
         public void stopAdvertisingSet(IAdvertisingSetCallback callback) {
             GattService service = getService();
             if (service == null) return;
             service.stopAdvertisingSet(callback);
         }
 
+        @Override
         public void getOwnAddress(int advertiserId) {
             GattService service = getService();
             if (service == null) return;
             service.getOwnAddress(advertiserId);
         }
 
+        @Override
         public void enableAdvertisingSet(
                 int advertiserId, boolean enable, int duration, int maxExtAdvEvents) {
             GattService service = getService();
@@ -636,18 +679,21 @@ public class GattService extends ProfileService {
             service.enableAdvertisingSet(advertiserId, enable, duration, maxExtAdvEvents);
         }
 
+        @Override
         public void setAdvertisingData(int advertiserId, AdvertiseData data) {
             GattService service = getService();
             if (service == null) return;
             service.setAdvertisingData(advertiserId, data);
         }
 
+        @Override
         public void setScanResponseData(int advertiserId, AdvertiseData data) {
             GattService service = getService();
             if (service == null) return;
             service.setScanResponseData(advertiserId, data);
         }
 
+        @Override
         public void setAdvertisingParameters(
                 int advertiserId, AdvertisingSetParameters parameters) {
             GattService service = getService();
@@ -655,6 +701,7 @@ public class GattService extends ProfileService {
             service.setAdvertisingParameters(advertiserId, parameters);
         }
 
+        @Override
         public void setPeriodicAdvertisingParameters(
                 int advertiserId, PeriodicAdvertisingParameters parameters) {
             GattService service = getService();
@@ -662,12 +709,14 @@ public class GattService extends ProfileService {
             service.setPeriodicAdvertisingParameters(advertiserId, parameters);
         }
 
+        @Override
         public void setPeriodicAdvertisingData(int advertiserId, AdvertiseData data) {
             GattService service = getService();
             if (service == null) return;
             service.setPeriodicAdvertisingData(advertiserId, data);
         }
 
+        @Override
         public void setPeriodicAdvertisingEnable(int advertiserId, boolean enable) {
             GattService service = getService();
             if (service == null) return;
@@ -1015,6 +1064,7 @@ public class GattService extends ProfileService {
         // This callback was called from the jni_workqueue thread. If we make request to the stack
         // on the same thread, it might cause deadlock. Schedule request on a new thread instead.
         Thread t = new Thread(new Runnable() {
+            @Override
             public void run() {
                 gattClientGetGattDbNative(connId);
             }
diff --git a/src/com/android/bluetooth/hdp/HealthService.java b/src/com/android/bluetooth/hdp/HealthService.java
index 9e1cabedb..7c6e1c8a6 100644
--- a/src/com/android/bluetooth/hdp/HealthService.java
+++ b/src/com/android/bluetooth/hdp/HealthService.java
@@ -73,14 +73,17 @@ public class HealthService extends ProfileService {
         classInitNative();
     }
 
+    @Override
     protected String getName() {
         return TAG;
     }
 
+    @Override
     protected IProfileServiceBinder initBinder() {
         return new BluetoothHealthBinder(this);
     }
 
+    @Override
     protected boolean start() {
         mHealthChannels = Collections.synchronizedList(new ArrayList<HealthChannel>());
         mApps = Collections.synchronizedMap(new HashMap<BluetoothHealthAppConfiguration,
@@ -96,6 +99,7 @@ public class HealthService extends ProfileService {
         return true;
     }
 
+    @Override
     protected boolean stop() {
         if (mHandler != null) {
             mHandler.removeCallbacksAndMessages(null);
@@ -121,6 +125,7 @@ public class HealthService extends ProfileService {
             }
         }
     }
+    @Override
     protected boolean cleanup() {
         mHandler = null;
         //Cleanup native
@@ -299,6 +304,7 @@ public class HealthService extends ProfileService {
             mConfig = config;
         }
 
+        @Override
         public void binderDied() {
             if (DBG) Log.d(TAG,"Binder is dead.");
             mService.unregisterAppConfiguration(mConfig);
@@ -320,6 +326,7 @@ public class HealthService extends ProfileService {
             mService = svc;
         }
 
+        @Override
         public boolean cleanup()  {
             mService = null;
             return true;
@@ -337,6 +344,7 @@ public class HealthService extends ProfileService {
             return null;
         }
 
+        @Override
         public boolean registerAppConfiguration(BluetoothHealthAppConfiguration config,
                                                 IBluetoothHealthCallback callback) {
             HealthService service = getService();
@@ -344,12 +352,14 @@ public class HealthService extends ProfileService {
             return service.registerAppConfiguration(config, callback);
         }
 
+        @Override
         public boolean unregisterAppConfiguration(BluetoothHealthAppConfiguration config) {
             HealthService service = getService();
             if (service == null) return false;
             return service.unregisterAppConfiguration(config);
         }
 
+        @Override
         public boolean connectChannelToSource(BluetoothDevice device,
                                               BluetoothHealthAppConfiguration config) {
             HealthService service = getService();
@@ -357,6 +367,7 @@ public class HealthService extends ProfileService {
             return service.connectChannelToSource(device, config);
         }
 
+        @Override
         public boolean connectChannelToSink(BluetoothDevice device,
                            BluetoothHealthAppConfiguration config, int channelType) {
             HealthService service = getService();
@@ -364,6 +375,7 @@ public class HealthService extends ProfileService {
             return service.connectChannelToSink(device, config, channelType);
         }
 
+        @Override
         public boolean disconnectChannel(BluetoothDevice device,
                                          BluetoothHealthAppConfiguration config, int channelId) {
             HealthService service = getService();
@@ -371,6 +383,7 @@ public class HealthService extends ProfileService {
             return service.disconnectChannel(device, config, channelId);
         }
 
+        @Override
         public ParcelFileDescriptor getMainChannelFd(BluetoothDevice device,
                                                      BluetoothHealthAppConfiguration config) {
             HealthService service = getService();
@@ -378,18 +391,21 @@ public class HealthService extends ProfileService {
             return service.getMainChannelFd(device, config);
         }
 
+        @Override
         public int getHealthDeviceConnectionState(BluetoothDevice device) {
             HealthService service = getService();
             if (service == null) return BluetoothHealth.STATE_DISCONNECTED;
             return service.getHealthDeviceConnectionState(device);
         }
 
+        @Override
         public List<BluetoothDevice> getConnectedHealthDevices() {
             HealthService service = getService();
             if (service == null) return new ArrayList<BluetoothDevice> (0);
             return service.getConnectedHealthDevices();
         }
 
+        @Override
         public List<BluetoothDevice> getHealthDevicesMatchingConnectionStates(int[] states) {
             HealthService service = getService();
             if (service == null) return new ArrayList<BluetoothDevice> (0);
diff --git a/src/com/android/bluetooth/hfp/HeadsetPhoneState.java b/src/com/android/bluetooth/hfp/HeadsetPhoneState.java
index 38a63afac..06792155d 100644
--- a/src/com/android/bluetooth/hfp/HeadsetPhoneState.java
+++ b/src/com/android/bluetooth/hfp/HeadsetPhoneState.java
@@ -118,6 +118,7 @@ class HeadsetPhoneState {
         mStateMachine = null;
     }
 
+    @Override
     public String toString() {
         return "HeadsetPhoneState [mService=" + mService + ", mNumActive=" + mNumActive
                 + ", mCallState=" + mCallState + ", mNumHeld=" + mNumHeld + ", mSignal=" + mSignal
diff --git a/src/com/android/bluetooth/hfp/HeadsetService.java b/src/com/android/bluetooth/hfp/HeadsetService.java
index d1fc4a539..6641196c1 100644
--- a/src/com/android/bluetooth/hfp/HeadsetService.java
+++ b/src/com/android/bluetooth/hfp/HeadsetService.java
@@ -46,14 +46,17 @@ public class HeadsetService extends ProfileService {
     private HeadsetStateMachine mStateMachine;
     private static HeadsetService sHeadsetService;
 
+    @Override
     protected String getName() {
         return TAG;
     }
 
+    @Override
     public IProfileServiceBinder initBinder() {
         return new BluetoothHeadsetBinder(this);
     }
 
+    @Override
     protected boolean start() {
         mStateMachine = HeadsetStateMachine.make(this);
         IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
@@ -68,6 +71,7 @@ public class HeadsetService extends ProfileService {
         return true;
     }
 
+    @Override
     protected boolean stop() {
         try {
             unregisterReceiver(mHeadsetReceiver);
@@ -80,6 +84,7 @@ public class HeadsetService extends ProfileService {
         return true;
     }
 
+    @Override
     protected boolean cleanup() {
         if (mStateMachine != null) {
             mStateMachine.cleanup();
@@ -121,6 +126,7 @@ public class HeadsetService extends ProfileService {
         public BluetoothHeadsetBinder(HeadsetService svc) {
             mService = svc;
         }
+        @Override
         public boolean cleanup() {
             mService = null;
             return true;
@@ -138,12 +144,14 @@ public class HeadsetService extends ProfileService {
             return null;
         }
 
+        @Override
         public boolean connect(BluetoothDevice device) {
             HeadsetService service = getService();
             if (service == null) return false;
             return service.connect(device);
         }
 
+        @Override
         public boolean disconnect(BluetoothDevice device) {
             HeadsetService service = getService();
             if (service == null) return false;
@@ -151,102 +159,119 @@ public class HeadsetService extends ProfileService {
             return service.disconnect(device);
         }
 
+        @Override
         public List<BluetoothDevice> getConnectedDevices() {
             HeadsetService service = getService();
             if (service == null) return new ArrayList<BluetoothDevice>(0);
             return service.getConnectedDevices();
         }
 
+        @Override
         public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
             HeadsetService service = getService();
             if (service == null) return new ArrayList<BluetoothDevice>(0);
             return service.getDevicesMatchingConnectionStates(states);
         }
 
+        @Override
         public int getConnectionState(BluetoothDevice device) {
             HeadsetService service = getService();
             if (service == null) return BluetoothProfile.STATE_DISCONNECTED;
             return service.getConnectionState(device);
         }
 
+        @Override
         public boolean setPriority(BluetoothDevice device, int priority) {
             HeadsetService service = getService();
             if (service == null) return false;
             return service.setPriority(device, priority);
         }
 
+        @Override
         public int getPriority(BluetoothDevice device) {
             HeadsetService service = getService();
             if (service == null) return BluetoothProfile.PRIORITY_UNDEFINED;
             return service.getPriority(device);
         }
 
+        @Override
         public boolean startVoiceRecognition(BluetoothDevice device) {
             HeadsetService service = getService();
             if (service == null) return false;
             return service.startVoiceRecognition(device);
         }
 
+        @Override
         public boolean stopVoiceRecognition(BluetoothDevice device) {
             HeadsetService service = getService();
             if (service == null) return false;
             return service.stopVoiceRecognition(device);
         }
 
+        @Override
         public boolean isAudioOn() {
             HeadsetService service = getService();
             if (service == null) return false;
             return service.isAudioOn();
         }
 
+        @Override
         public boolean isAudioConnected(BluetoothDevice device) {
             HeadsetService service = getService();
             if (service == null) return false;
             return service.isAudioConnected(device);
         }
 
+        @Override
         public int getBatteryUsageHint(BluetoothDevice device) {
             HeadsetService service = getService();
             if (service == null) return 0;
             return service.getBatteryUsageHint(device);
         }
 
+        @Override
         public boolean acceptIncomingConnect(BluetoothDevice device) {
             HeadsetService service = getService();
             if (service == null) return false;
             return service.acceptIncomingConnect(device);
         }
 
+        @Override
         public boolean rejectIncomingConnect(BluetoothDevice device) {
             HeadsetService service = getService();
             if (service == null) return false;
             return service.rejectIncomingConnect(device);
         }
 
+        @Override
         public int getAudioState(BluetoothDevice device) {
             HeadsetService service = getService();
             if (service == null) return BluetoothHeadset.STATE_AUDIO_DISCONNECTED;
             return service.getAudioState(device);
         }
 
+        @Override
         public boolean connectAudio() {
             HeadsetService service = getService();
             if (service == null) return false;
             return service.connectAudio();
         }
 
+        @Override
         public boolean disconnectAudio() {
             HeadsetService service = getService();
             if (service == null) return false;
             return service.disconnectAudio();
         }
 
+        @Override
         public void setAudioRouteAllowed(boolean allowed) {
             HeadsetService service = getService();
             if (service == null) return;
             service.setAudioRouteAllowed(allowed);
         }
 
+        @Override
         public boolean getAudioRouteAllowed() {
             HeadsetService service = getService();
             if (service != null) {
@@ -255,24 +280,28 @@ public class HeadsetService extends ProfileService {
             return false;
         }
 
+        @Override
         public void setForceScoAudio(boolean forced) {
             HeadsetService service = getService();
             if (service == null) return;
             service.setForceScoAudio(forced);
         }
 
+        @Override
         public boolean startScoUsingVirtualVoiceCall(BluetoothDevice device) {
             HeadsetService service = getService();
             if (service == null) return false;
             return service.startScoUsingVirtualVoiceCall(device);
         }
 
+        @Override
         public boolean stopScoUsingVirtualVoiceCall(BluetoothDevice device) {
             HeadsetService service = getService();
             if (service == null) return false;
             return service.stopScoUsingVirtualVoiceCall(device);
         }
 
+        @Override
         public void phoneStateChanged(
                 int numActive, int numHeld, int callState, String number, int type) {
             HeadsetService service = getService();
@@ -280,6 +309,7 @@ public class HeadsetService extends ProfileService {
             service.phoneStateChanged(numActive, numHeld, callState, number, type);
         }
 
+        @Override
         public void clccResponse(int index, int direction, int status, int mode, boolean mpty,
                 String number, int type) {
             HeadsetService service = getService();
@@ -287,6 +317,7 @@ public class HeadsetService extends ProfileService {
             service.clccResponse(index, direction, status, mode, mpty, number, type);
         }
 
+        @Override
         public boolean sendVendorSpecificResultCode(
                 BluetoothDevice device, String command, String arg) {
             HeadsetService service = getService();
@@ -296,18 +327,21 @@ public class HeadsetService extends ProfileService {
             return service.sendVendorSpecificResultCode(device, command, arg);
         }
 
+        @Override
         public boolean enableWBS() {
             HeadsetService service = getService();
             if (service == null) return false;
             return service.enableWBS();
         }
 
+        @Override
         public boolean disableWBS() {
             HeadsetService service = getService();
             if (service == null) return false;
             return service.disableWBS();
         }
 
+        @Override
         public void bindResponse(int ind_id, boolean ind_status) {
             HeadsetService service = getService();
             if (service == null) return;
diff --git a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
index ac9fafbbf..d92a66215 100644
--- a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
+++ b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
@@ -2008,11 +2008,13 @@ final class HeadsetStateMachine extends StateMachine {
     }
 
     private final ServiceConnection mConnection = new ServiceConnection() {
+        @Override
         public void onServiceConnected(ComponentName className, IBinder service) {
             if (DBG) Log.d(TAG, "Proxy object connected");
             mPhoneProxy = IBluetoothHeadsetPhone.Stub.asInterface(service);
         }
 
+        @Override
         public void onServiceDisconnected(ComponentName className) {
             if (DBG) Log.d(TAG, "Proxy object disconnected");
             mPhoneProxy = null;
diff --git a/src/com/android/bluetooth/hid/HidService.java b/src/com/android/bluetooth/hid/HidService.java
index a0dc6a583..8c3fc9d00 100644
--- a/src/com/android/bluetooth/hid/HidService.java
+++ b/src/com/android/bluetooth/hid/HidService.java
@@ -72,14 +72,17 @@ public class HidService extends ProfileService {
         classInitNative();
     }
 
+    @Override
     public String getName() {
         return TAG;
     }
 
+    @Override
     public IProfileServiceBinder initBinder() {
         return new BluetoothInputDeviceBinder(this);
     }
 
+    @Override
     protected boolean start() {
         mInputDevices = Collections.synchronizedMap(new HashMap<BluetoothDevice, Integer>());
         initializeNative();
@@ -88,11 +91,13 @@ public class HidService extends ProfileService {
         return true;
     }
 
+    @Override
     protected boolean stop() {
         if (DBG) log("Stopping Bluetooth HidService");
         return true;
     }
 
+    @Override
     protected boolean cleanup() {
         if (mNativeAvailable) {
             cleanupNative();
@@ -322,6 +327,7 @@ public class HidService extends ProfileService {
             mService = svc;
         }
 
+        @Override
         public boolean cleanup() {
             mService = null;
             return true;
@@ -339,41 +345,48 @@ public class HidService extends ProfileService {
             return null;
         }
 
+        @Override
         public boolean connect(BluetoothDevice device) {
             HidService service = getService();
             if (service == null) return false;
             return service.connect(device);
         }
 
+        @Override
         public boolean disconnect(BluetoothDevice device) {
             HidService service = getService();
             if (service == null) return false;
             return service.disconnect(device);
         }
 
+        @Override
         public int getConnectionState(BluetoothDevice device) {
             HidService service = getService();
             if (service == null) return BluetoothInputDevice.STATE_DISCONNECTED;
             return service.getConnectionState(device);
         }
 
+        @Override
         public List<BluetoothDevice> getConnectedDevices() {
             return getDevicesMatchingConnectionStates(
                     new int[] {BluetoothProfile.STATE_CONNECTED});
         }
 
+        @Override
         public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
             HidService service = getService();
             if (service == null) return new ArrayList<BluetoothDevice>(0);
             return service.getDevicesMatchingConnectionStates(states);
         }
 
+        @Override
         public boolean setPriority(BluetoothDevice device, int priority) {
             HidService service = getService();
             if (service == null) return false;
             return service.setPriority(device, priority);
         }
 
+        @Override
         public int getPriority(BluetoothDevice device) {
             HidService service = getService();
             if (service == null) return BluetoothProfile.PRIORITY_UNDEFINED;
@@ -381,48 +394,56 @@ public class HidService extends ProfileService {
         }
 
         /* The following APIs regarding test app for compliance */
+        @Override
         public boolean getProtocolMode(BluetoothDevice device) {
             HidService service = getService();
             if (service == null) return false;
             return service.getProtocolMode(device);
         }
 
+        @Override
         public boolean virtualUnplug(BluetoothDevice device) {
             HidService service = getService();
             if (service == null) return false;
             return service.virtualUnplug(device);
         }
 
+        @Override
         public boolean setProtocolMode(BluetoothDevice device, int protocolMode) {
             HidService service = getService();
             if (service == null) return false;
             return service.setProtocolMode(device, protocolMode);
         }
         
+        @Override
         public boolean getReport(BluetoothDevice device, byte reportType, byte reportId, int bufferSize) {
             HidService service = getService();
             if (service == null) return false;
             return service.getReport(device, reportType, reportId, bufferSize) ;
         }
 
+        @Override
         public boolean setReport(BluetoothDevice device, byte reportType, String report) {
             HidService service = getService();
             if (service == null) return false;
             return service.setReport(device, reportType, report);
         }
 
+        @Override
         public boolean sendData(BluetoothDevice device, String report) {
             HidService service = getService();
             if (service == null) return false;
             return service.sendData(device, report);
         }
 
+        @Override
         public boolean setIdleTime(BluetoothDevice device, byte idleTime) {
             HidService service = getService();
             if (service == null) return false;
             return service.setIdleTime(device, idleTime);
         }
 
+        @Override
         public boolean getIdleTime(BluetoothDevice device) {
             HidService service = getService();
             if (service == null) return false;
diff --git a/src/com/android/bluetooth/map/BluetoothMapContentObserver.java b/src/com/android/bluetooth/map/BluetoothMapContentObserver.java
index 6d75b95bc..ac3b1cf5d 100644
--- a/src/com/android/bluetooth/map/BluetoothMapContentObserver.java
+++ b/src/com/android/bluetooth/map/BluetoothMapContentObserver.java
@@ -3219,6 +3219,7 @@ public class BluetoothMapContentObserver {
             }
         }
 
+        @Override
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             Log.d(TAG, "onReceive: action"  + action);
diff --git a/src/com/android/bluetooth/map/BluetoothMapConvoContactElement.java b/src/com/android/bluetooth/map/BluetoothMapConvoContactElement.java
index d1416507d..c4a2fa88e 100644
--- a/src/com/android/bluetooth/map/BluetoothMapConvoContactElement.java
+++ b/src/com/android/bluetooth/map/BluetoothMapConvoContactElement.java
@@ -179,6 +179,7 @@ public class BluetoothMapConvoContactElement
         return mUci;
     }
 
+    @Override
     public int compareTo(BluetoothMapConvoContactElement e) {
         if (this.mLastActivity < e.mLastActivity) {
             return 1;
diff --git a/src/com/android/bluetooth/map/BluetoothMapConvoListingElement.java b/src/com/android/bluetooth/map/BluetoothMapConvoListingElement.java
index 572bd1240..d0c652c4d 100644
--- a/src/com/android/bluetooth/map/BluetoothMapConvoListingElement.java
+++ b/src/com/android/bluetooth/map/BluetoothMapConvoListingElement.java
@@ -229,6 +229,7 @@ public class BluetoothMapConvoListingElement
         mSmsMmsContacts = smsMmsContacts;
     }
 
+    @Override
     public int compareTo(BluetoothMapConvoListingElement e) {
         if (this.mLastActivity < e.mLastActivity) {
             return 1;
diff --git a/src/com/android/bluetooth/map/BluetoothMapMessageListingElement.java b/src/com/android/bluetooth/map/BluetoothMapMessageListingElement.java
index 7e5f6de7b..78460223b 100644
--- a/src/com/android/bluetooth/map/BluetoothMapMessageListingElement.java
+++ b/src/com/android/bluetooth/map/BluetoothMapMessageListingElement.java
@@ -252,6 +252,7 @@ public class BluetoothMapMessageListingElement
         this.mFolderType = folderType;
     }
 
+    @Override
     public int compareTo(BluetoothMapMessageListingElement e) {
         if (this.mDateTime < e.mDateTime) {
             return 1;
diff --git a/src/com/android/bluetooth/map/BluetoothMapService.java b/src/com/android/bluetooth/map/BluetoothMapService.java
index e85905584..21ee1ce51 100644
--- a/src/com/android/bluetooth/map/BluetoothMapService.java
+++ b/src/com/android/bluetooth/map/BluetoothMapService.java
@@ -816,6 +816,7 @@ public class BluetoothMapService extends ProfileService {
         return true;
     }
 
+    @Override
     public boolean cleanup()  {
         if (DEBUG) Log.d(TAG, "cleanup()");
         setState(BluetoothMap.STATE_DISCONNECTED, BluetoothMap.RESULT_CANCELED);
@@ -1156,11 +1157,13 @@ public class BluetoothMapService extends ProfileService {
             mService = service;
         }
 
+        @Override
         public boolean cleanup()  {
             mService = null;
             return true;
         }
 
+        @Override
         public int getState() {
             if (VERBOSE) Log.v(TAG, "getState()");
             BluetoothMapService service = getService();
@@ -1168,6 +1171,7 @@ public class BluetoothMapService extends ProfileService {
             return getService().getState();
         }
 
+        @Override
         public BluetoothDevice getClient() {
             if (VERBOSE) Log.v(TAG, "getClient()");
             BluetoothMapService service = getService();
@@ -1176,6 +1180,7 @@ public class BluetoothMapService extends ProfileService {
             return service.getRemoteDevice();
         }
 
+        @Override
         public boolean isConnected(BluetoothDevice device) {
             if (VERBOSE) Log.v(TAG, "isConnected()");
             BluetoothMapService service = getService();
@@ -1184,6 +1189,7 @@ public class BluetoothMapService extends ProfileService {
                     && service.getRemoteDevice().equals(device);
         }
 
+        @Override
         public boolean connect(BluetoothDevice device) {
             if (VERBOSE) Log.v(TAG, "connect()");
             BluetoothMapService service = getService();
@@ -1191,6 +1197,7 @@ public class BluetoothMapService extends ProfileService {
             return false;
         }
 
+        @Override
         public boolean disconnect(BluetoothDevice device) {
             if (VERBOSE) Log.v(TAG, "disconnect()");
             BluetoothMapService service = getService();
@@ -1198,6 +1205,7 @@ public class BluetoothMapService extends ProfileService {
             return service.disconnect(device);
         }
 
+        @Override
         public List<BluetoothDevice> getConnectedDevices() {
             if (VERBOSE) Log.v(TAG, "getConnectedDevices()");
             BluetoothMapService service = getService();
@@ -1205,6 +1213,7 @@ public class BluetoothMapService extends ProfileService {
             return service.getConnectedDevices();
         }
 
+        @Override
         public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
             if (VERBOSE) Log.v(TAG, "getDevicesMatchingConnectionStates()");
             BluetoothMapService service = getService();
@@ -1212,6 +1221,7 @@ public class BluetoothMapService extends ProfileService {
             return service.getDevicesMatchingConnectionStates(states);
         }
 
+        @Override
         public int getConnectionState(BluetoothDevice device) {
             if (VERBOSE) Log.v(TAG, "getConnectionState()");
             BluetoothMapService service = getService();
@@ -1219,12 +1229,14 @@ public class BluetoothMapService extends ProfileService {
             return service.getConnectionState(device);
         }
 
+        @Override
         public boolean setPriority(BluetoothDevice device, int priority) {
             BluetoothMapService service = getService();
             if (service == null) return false;
             return service.setPriority(device, priority);
         }
 
+        @Override
         public int getPriority(BluetoothDevice device) {
             BluetoothMapService service = getService();
             if (service == null) return BluetoothProfile.PRIORITY_UNDEFINED;
diff --git a/src/com/android/bluetooth/map/BluetoothMapSettingsAdapter.java b/src/com/android/bluetooth/map/BluetoothMapSettingsAdapter.java
index 9e35a0f81..9aa591634 100644
--- a/src/com/android/bluetooth/map/BluetoothMapSettingsAdapter.java
+++ b/src/com/android/bluetooth/map/BluetoothMapSettingsAdapter.java
@@ -73,6 +73,7 @@ public class BluetoothMapSettingsAdapter extends BaseExpandableListAdapter {
 
         listView.setOnGroupExpandListener(new OnGroupExpandListener() {
 
+            @Override
             public void onGroupExpand(int groupPosition) {
                 BluetoothMapAccountItem group = mMainGroup.get(groupPosition);
                 if (mProupList.get(group).size() > 0)
@@ -120,6 +121,7 @@ public class BluetoothMapSettingsAdapter extends BaseExpandableListAdapter {
             final BluetoothMapAccountItem child =  getChild(groupPosition, childPosition);
             holder.cb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
 
+                @Override
                 public void onCheckedChanged(CompoundButton buttonView,
                         boolean isChecked) {
                     BluetoothMapAccountItem parentGroup = 
@@ -249,6 +251,7 @@ public class BluetoothMapSettingsAdapter extends BaseExpandableListAdapter {
 
         holder.cb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
 
+            @Override
             public void onCheckedChanged(CompoundButton buttonView,
                     boolean isChecked) {
                 if (mCheckAll) {
@@ -272,6 +275,7 @@ public class BluetoothMapSettingsAdapter extends BaseExpandableListAdapter {
                 notifyDataSetChanged();
                 new Handler().postDelayed(new Runnable() {
 
+                    @Override
                     public void run() {
                         if (!mCheckAll)
                             mCheckAll = true;
diff --git a/src/com/android/bluetooth/map/BluetoothMapbMessageEmail.java b/src/com/android/bluetooth/map/BluetoothMapbMessageEmail.java
index 83ec6469d..35d6905d0 100644
--- a/src/com/android/bluetooth/map/BluetoothMapbMessageEmail.java
+++ b/src/com/android/bluetooth/map/BluetoothMapbMessageEmail.java
@@ -34,6 +34,7 @@ public class BluetoothMapbMessageEmail extends BluetoothMapbMessage {
         return mEmailBody;
     }
 
+    @Override
     public void parseMsgPart(String msgPart) {
         if (mEmailBody == null)
             mEmailBody = msgPart;
@@ -45,10 +46,12 @@ public class BluetoothMapbMessageEmail extends BluetoothMapbMessage {
      * Set initial values before parsing - will be called is a message body is found
      * during parsing.
      */
+    @Override
     public void parseMsgInit() {
         // Not used for e-mail
     }
 
+    @Override
     public byte[] encode() throws UnsupportedEncodingException
     {
         ArrayList<byte[]> bodyFragments = new ArrayList<byte[]>();
diff --git a/src/com/android/bluetooth/map/BluetoothMapbMessageSms.java b/src/com/android/bluetooth/map/BluetoothMapbMessageSms.java
index 9f57f60f4..f794f23aa 100644
--- a/src/com/android/bluetooth/map/BluetoothMapbMessageSms.java
+++ b/src/com/android/bluetooth/map/BluetoothMapbMessageSms.java
@@ -68,6 +68,7 @@ public class BluetoothMapbMessageSms extends BluetoothMapbMessage {
         mSmsBody = "";
     }
 
+    @Override
     public byte[] encode() throws UnsupportedEncodingException
     {
         ArrayList<byte[]> bodyFragments = new ArrayList<byte[]>();
diff --git a/src/com/android/bluetooth/map/MmsFileProvider.java b/src/com/android/bluetooth/map/MmsFileProvider.java
index c4faaa838..54b9a60c6 100644
--- a/src/com/android/bluetooth/map/MmsFileProvider.java
+++ b/src/com/android/bluetooth/map/MmsFileProvider.java
@@ -104,6 +104,7 @@ public class MmsFileProvider extends ContentProvider {
          * Generate a message based on the cursor, and write the encoded data to the stream.
          */
 
+        @Override
         public void writeDataToPipe(ParcelFileDescriptor output, Uri uri, String mimeType,
                 Bundle opts, Cursor c) {
             if (BluetoothMapService.DEBUG) Log.d(TAG, "writeDataToPipe(): uri=" + uri.toString() +
diff --git a/src/com/android/bluetooth/mapclient/MapClientService.java b/src/com/android/bluetooth/mapclient/MapClientService.java
index ce6aee27d..0b7652022 100644
--- a/src/com/android/bluetooth/mapclient/MapClientService.java
+++ b/src/com/android/bluetooth/mapclient/MapClientService.java
@@ -180,6 +180,7 @@ public class MapClientService extends ProfileService {
         return true;
     }
 
+    @Override
     public boolean cleanup() {
         if (DBG) Log.d(TAG, "cleanup()");
         return true;
@@ -227,11 +228,13 @@ public class MapClientService extends ProfileService {
             return null;
         }
 
+        @Override
         public boolean cleanup() {
             mService = null;
             return true;
         }
 
+        @Override
         public boolean isConnected(BluetoothDevice device) {
             if (VDBG) Log.v(TAG, "isConnected()");
             MapClientService service = getService();
@@ -239,6 +242,7 @@ public class MapClientService extends ProfileService {
             return service.getConnectionState(device) == BluetoothProfile.STATE_CONNECTED;
         }
 
+        @Override
         public boolean connect(BluetoothDevice device) {
             if (VDBG) Log.v(TAG, "connect()");
             MapClientService service = getService();
@@ -246,6 +250,7 @@ public class MapClientService extends ProfileService {
             return service.connect(device);
         }
 
+        @Override
         public boolean disconnect(BluetoothDevice device) {
             if (VDBG) Log.v(TAG, "disconnect()");
             MapClientService service = getService();
@@ -253,6 +258,7 @@ public class MapClientService extends ProfileService {
             return service.disconnect(device);
         }
 
+        @Override
         public List<BluetoothDevice> getConnectedDevices() {
             if (VDBG) Log.v(TAG, "getConnectedDevices()");
             MapClientService service = getService();
@@ -260,6 +266,7 @@ public class MapClientService extends ProfileService {
             return service.getConnectedDevices();
         }
 
+        @Override
         public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
             if (VDBG) Log.v(TAG, "getDevicesMatchingConnectionStates()");
             MapClientService service = getService();
@@ -267,6 +274,7 @@ public class MapClientService extends ProfileService {
             return service.getDevicesMatchingConnectionStates(states);
         }
 
+        @Override
         public int getConnectionState(BluetoothDevice device) {
             if (VDBG) Log.v(TAG, "getConnectionState()");
             MapClientService service = getService();
@@ -274,18 +282,21 @@ public class MapClientService extends ProfileService {
             return service.getConnectionState(device);
         }
 
+        @Override
         public boolean setPriority(BluetoothDevice device, int priority) {
             MapClientService service = getService();
             if (service == null) return false;
             return service.setPriority(device, priority);
         }
 
+        @Override
         public int getPriority(BluetoothDevice device) {
             MapClientService service = getService();
             if (service == null) return BluetoothProfile.PRIORITY_UNDEFINED;
             return service.getPriority(device);
         }
 
+        @Override
         public boolean sendMessage(BluetoothDevice device, Uri[] contacts, String message,
                 PendingIntent sentIntent, PendingIntent deliveredIntent) {
             MapClientService service = getService();
@@ -297,6 +308,7 @@ public class MapClientService extends ProfileService {
             return service.sendMessage(device, contacts, message, sentIntent, deliveredIntent);
         }
 
+        @Override
         public boolean getUnreadMessages(BluetoothDevice device) {
             MapClientService service = getService();
             if (service == null) return false;
diff --git a/src/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java b/src/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java
index efc62b0d3..9e1a15b7c 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java
@@ -78,6 +78,7 @@ public class BluetoothOppBtEnableActivity extends AlertActivity implements
         return view;
     }
 
+    @Override
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
             case DialogInterface.BUTTON_POSITIVE:
diff --git a/src/com/android/bluetooth/opp/BluetoothOppBtErrorActivity.java b/src/com/android/bluetooth/opp/BluetoothOppBtErrorActivity.java
index d2380f661..71dcc6b38 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppBtErrorActivity.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppBtErrorActivity.java
@@ -76,6 +76,7 @@ public class BluetoothOppBtErrorActivity extends AlertActivity implements
         return view;
     }
 
+    @Override
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
             case DialogInterface.BUTTON_POSITIVE:
diff --git a/src/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java b/src/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java
index dd4dc3c42..a89ce1d86 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java
@@ -55,6 +55,7 @@ public class BluetoothOppHandoverReceiver extends BroadcastReceiver {
                 final Context finalContext = context;
                 final ArrayList<Uri> finalUris = uris;
                 Thread t = new Thread(new Runnable() {
+                    @Override
                     public void run() {
                         BluetoothOppManager.getInstance(finalContext)
                                 .saveSendingFileInfo(mimeType, finalUris, true /* isHandover */,
diff --git a/src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java b/src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
index 3a3943960..456536061 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
@@ -134,6 +134,7 @@ public class BluetoothOppIncomingFileConfirmActivity extends AlertActivity imple
         return view;
     }
 
+    @Override
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
             case DialogInterface.BUTTON_POSITIVE:
diff --git a/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java b/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
index ab236730e..459161aef 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
@@ -109,6 +109,7 @@ public class BluetoothOppLauncherActivity extends Activity {
                     // Save type/stream, will be used when adding transfer
                     // session to DB.
                     Thread t = new Thread(new Runnable() {
+                        @Override
                         public void run() {
                             sendFileInfo(type, stream.toString(), false /* isHandover */,
                                     true /* fromExternal */);
@@ -122,6 +123,7 @@ public class BluetoothOppLauncherActivity extends Activity {
                     final Uri fileUri = creatFileForSharedContent(this.createCredentialProtectedStorageContext(), extra_text);
                     if (fileUri != null) {
                         Thread t = new Thread(new Runnable() {
+                            @Override
                             public void run() {
                                 sendFileInfo(type, fileUri.toString(), false /* isHandover */,
                                         false /* fromExternal */);
@@ -146,6 +148,7 @@ public class BluetoothOppLauncherActivity extends Activity {
                     if (V) Log.v(TAG, "Get ACTION_SHARE_MULTIPLE intent: uris " + uris + "\n Type= "
                                 + mimeType);
                     Thread t = new Thread(new Runnable() {
+                        @Override
                         public void run() {
                             try {
                                 BluetoothOppManager.getInstance(BluetoothOppLauncherActivity.this)
diff --git a/src/com/android/bluetooth/opp/BluetoothOppNotification.java b/src/com/android/bluetooth/opp/BluetoothOppNotification.java
index 19d359df0..a5cd70cfc 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppNotification.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppNotification.java
@@ -179,6 +179,7 @@ class BluetoothOppNotification {
     // 4. Handler checks if there are any more updates after 1 second.
     // 5. If there is an update, update it else stop.
     private Handler mHandler = new Handler() {
+        @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
                 case NOTIFY:
diff --git a/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java b/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
index 37cb5e0eb..0e5e84510 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
@@ -85,6 +85,7 @@ public class BluetoothOppObexClientSession implements BluetoothOppObexSession {
         mTransport = transport;
     }
 
+    @Override
     public void start(Handler handler, int numShares) {
         if (D) Log.d(TAG, "Start!");
         mCallback = handler;
@@ -92,6 +93,7 @@ public class BluetoothOppObexClientSession implements BluetoothOppObexSession {
         mThread.start();
     }
 
+    @Override
     public void stop() {
         if (D) Log.d(TAG, "Stop!");
         if (mThread != null) {
@@ -112,6 +114,7 @@ public class BluetoothOppObexClientSession implements BluetoothOppObexSession {
         mCallback = null;
     }
 
+    @Override
     public void addShare(BluetoothOppShareInfo share) {
         mThread.addShare(share);
     }
@@ -623,6 +626,7 @@ public class BluetoothOppObexClientSession implements BluetoothOppObexSession {
         }
     }
 
+    @Override
     public void unblock() {
         // Not used for client case
     }
diff --git a/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java b/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
index 5b4cddc72..d901157fc 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
@@ -111,6 +111,7 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler implemen
         mPartialWakeLock.setReferenceCounted(false);
     }
 
+    @Override
     public void unblock() {
         mServerBlocking = false;
     }
@@ -131,6 +132,7 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler implemen
     /**
      * Called from BluetoothOppTransfer to start the "Transfer"
      */
+    @Override
     public void start(Handler handler, int numShares) {
         if (D) Log.d(TAG, "Start!");
         mCallback = handler;
@@ -141,6 +143,7 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler implemen
      * Called from BluetoothOppTransfer to cancel the "Transfer" Otherwise,
      * server should end by itself.
      */
+    @Override
     public void stop() {
         /*
          * TODO now we implement in a tough way, just close the socket.
@@ -160,6 +163,7 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler implemen
         mSession = null;
     }
 
+    @Override
     public void addShare(BluetoothOppShareInfo info) {
         if (D) Log.d(TAG, "addShare for id " + info.mId);
         mInfo = info;
diff --git a/src/com/android/bluetooth/opp/BluetoothOppService.java b/src/com/android/bluetooth/opp/BluetoothOppService.java
index b68936a35..105fa3958 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppService.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppService.java
@@ -169,6 +169,7 @@ public class BluetoothOppService extends ProfileService implements IObexConnecti
 
         final ContentResolver contentResolver = getContentResolver();
         new Thread("trimDatabase") {
+            @Override
             public void run() {
                 trimDatabase(contentResolver);
             }
@@ -1027,11 +1028,13 @@ public class BluetoothOppService extends ProfileService implements IObexConnecti
             mConnection.connect();
         }
 
+        @Override
         public void onMediaScannerConnected() {
             if (V) Log.v(TAG, "MediaScannerConnection onMediaScannerConnected");
             mConnection.scanFile(mInfo.mFilename, mInfo.mMimetype);
         }
 
+        @Override
         public void onScanCompleted(String path, Uri uri) {
             try {
                 if (V) {
diff --git a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java
index b3e4c9818..40601d784 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java
@@ -578,6 +578,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch
     public void confirmStatusChanged() {
         /* unblock server session */
         final Thread notifyThread = new Thread("Server Unblock thread") {
+            @Override
             public void run() {
                 synchronized (mSession) {
                     mSession.unblock();
@@ -648,6 +649,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch
             l2cChannel = l2capChannel;
         }
 
+        @Override
         public void interrupt() {
             if (D) Log.d(TAG, "start interrupt :" + btSocket);
             isInterrupted = true;
@@ -795,6 +797,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch
     /**
      * Process when a share is added to current transfer
      */
+    @Override
     public void onShareAdded(int id) {
         BluetoothOppShareInfo info = mBatch.getPendingShare();
         if (info.mDirection == BluetoothShare.DIRECTION_INBOUND) {
@@ -825,6 +828,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch
     /**
      * Process when a share is deleted from current transfer
      */
+    @Override
     public void onShareDeleted(int id) {
 
     }
@@ -832,6 +836,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch
     /**
      * Process when current transfer is canceled
      */
+    @Override
     public void onBatchCanceled() {
         if (V) Log.v(TAG, "Transfer on Batch canceled");
 
diff --git a/src/com/android/bluetooth/opp/BluetoothOppTransferActivity.java b/src/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
index cc5941322..9dfe4f5d2 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
@@ -346,6 +346,7 @@ public class BluetoothOppTransferActivity extends AlertActivity implements
         }
     }
 
+    @Override
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
             case DialogInterface.BUTTON_POSITIVE:
diff --git a/src/com/android/bluetooth/opp/BluetoothOppTransferHistory.java b/src/com/android/bluetooth/opp/BluetoothOppTransferHistory.java
index fd4731835..7d1356690 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppTransferHistory.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppTransferHistory.java
@@ -233,6 +233,7 @@ public class BluetoothOppTransferHistory extends Activity implements
         new AlertDialog.Builder(this).setTitle(R.string.transfer_clear_dlg_title).setMessage(
                 R.string.transfer_clear_dlg_msg).setPositiveButton(android.R.string.ok,
                 new DialogInterface.OnClickListener() {
+                    @Override
                     public void onClick(DialogInterface dialog, int whichButton) {
                         clearAllDownloads();
                     }
@@ -279,6 +280,7 @@ public class BluetoothOppTransferHistory extends Activity implements
      * android.widget.AdapterView.OnItemClickListener#onItemClick(android.widget
      * .AdapterView, android.view.View, int, long)
      */
+    @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         // Open the selected item
         if (V) Log.v(TAG, "onItemClick: ContextMenu = " + mContextMenu);
diff --git a/src/com/android/bluetooth/opp/TestActivity.java b/src/com/android/bluetooth/opp/TestActivity.java
index f3afd9e90..43d542f2a 100644
--- a/src/com/android/bluetooth/opp/TestActivity.java
+++ b/src/com/android/bluetooth/opp/TestActivity.java
@@ -214,6 +214,7 @@ public class TestActivity extends Activity {
     }
 
     public OnClickListener insertRecordListener = new OnClickListener() {
+        @Override
         public void onClick(View view) {
 
             String address = null;
@@ -275,6 +276,7 @@ public class TestActivity extends Activity {
     };
 
     public OnClickListener deleteRecordListener = new OnClickListener() {
+        @Override
         public void onClick(View view) {
             Uri contentUri = Uri.parse(BluetoothShare.CONTENT_URI + "/"
                     + mDeleteView.getText().toString());
@@ -283,6 +285,7 @@ public class TestActivity extends Activity {
     };
 
     public OnClickListener updateRecordListener = new OnClickListener() {
+        @Override
         public void onClick(View view) {
             Uri contentUri = Uri.parse(BluetoothShare.CONTENT_URI + "/"
                     + mUpdateView.getText().toString());
@@ -299,6 +302,7 @@ public class TestActivity extends Activity {
     };
 
     public OnClickListener ackRecordListener = new OnClickListener() {
+        @Override
         public void onClick(View view) {
             Uri contentUri = Uri.parse(BluetoothShare.CONTENT_URI + "/"
                     + mAckView.getText().toString());
@@ -314,6 +318,7 @@ public class TestActivity extends Activity {
     };
 
     public OnClickListener deleteAllRecordListener = new OnClickListener() {
+        @Override
         public void onClick(View view) {
             Uri contentUri = Uri.parse(BluetoothShare.CONTENT_URI + "");
             getContentResolver().delete(contentUri, null, null);
@@ -321,6 +326,7 @@ public class TestActivity extends Activity {
     };
 
     public OnClickListener startTcpServerListener = new OnClickListener() {
+        @Override
         public void onClick(View view) {
             server = new TestTcpServer();
             Thread server_thread = new Thread(server);
@@ -330,8 +336,10 @@ public class TestActivity extends Activity {
     };
 
     public OnClickListener notifyTcpServerListener = new OnClickListener() {
+        @Override
         public void onClick(View view) {
             final Thread notifyThread = new Thread() {
+                @Override
                 public void run() {
                     synchronized (server) {
                         server.a = true;
@@ -385,6 +393,7 @@ class TestTcpListener {
             mSocketAcceptThread = new Thread(TAG) {
                 ServerSocket mServerSocket;
 
+                @Override
                 public void run() {
                     if (D) Log.d(TAG, "RfcommSocket listen thread starting");
                     try {
@@ -462,6 +471,7 @@ class TestTcpServer extends ServerRequestHandler implements Runnable {
     public boolean a = false;
 
     // TextView serverStatus = null;
+    @Override
     public void run() {
         try {
             updateStatus("[server:] listen on port " + port);
@@ -479,6 +489,7 @@ class TestTcpServer extends ServerRequestHandler implements Runnable {
         updateStatus("enter construtor of TcpServer");
     }
 
+    @Override
     public int onConnect(HeaderSet request, HeaderSet reply) {
 
         updateStatus("[server:] The client has created an OBEX session");
@@ -496,6 +507,7 @@ class TestTcpServer extends ServerRequestHandler implements Runnable {
         return ResponseCodes.OBEX_HTTP_OK;
     }
 
+    @Override
     public int onPut(Operation op) {
         FileOutputStream fos = null;
         try {
@@ -529,26 +541,32 @@ class TestTcpServer extends ServerRequestHandler implements Runnable {
         return ResponseCodes.OBEX_HTTP_OK;
     }
 
+    @Override
     public void onDisconnect(HeaderSet req, HeaderSet resp) {
         updateStatus("[server:] The client has disconnected the OBEX session");
     }
 
+    @Override
     public void updateStatus(String message) {
         Log.v(TAG, "\n" + message);
     }
 
+    @Override
     public void onAuthenticationFailure(byte[] userName) {
     }
 
+    @Override
     public int onSetPath(HeaderSet request, HeaderSet reply, boolean backup, boolean create) {
 
         return ResponseCodes.OBEX_HTTP_NOT_IMPLEMENTED;
     }
 
+    @Override
     public int onDelete(HeaderSet request, HeaderSet reply) {
         return ResponseCodes.OBEX_HTTP_NOT_IMPLEMENTED;
     }
 
+    @Override
     public int onGet(Operation op) {
         return ResponseCodes.OBEX_HTTP_NOT_IMPLEMENTED;
     }
@@ -600,41 +618,50 @@ class TestTcpTransport implements ObexTransport {
         this.s = s;
     }
 
+    @Override
     public void close() throws IOException {
         s.close();
     }
 
+    @Override
     public DataInputStream openDataInputStream() throws IOException {
         return new DataInputStream(openInputStream());
     }
 
+    @Override
     public DataOutputStream openDataOutputStream() throws IOException {
         return new DataOutputStream(openOutputStream());
     }
 
+    @Override
     public InputStream openInputStream() throws IOException {
         return s.getInputStream();
     }
 
+    @Override
     public OutputStream openOutputStream() throws IOException {
         return s.getOutputStream();
     }
 
+    @Override
     public void connect() throws IOException {
         // TODO Auto-generated method stub
 
     }
 
+    @Override
     public void create() throws IOException {
         // TODO Auto-generated method stub
 
     }
 
+    @Override
     public void disconnect() throws IOException {
         // TODO Auto-generated method stub
 
     }
 
+    @Override
     public void listen() throws IOException {
         // TODO Auto-generated method stub
 
diff --git a/src/com/android/bluetooth/pan/BluetoothTetheringNetworkFactory.java b/src/com/android/bluetooth/pan/BluetoothTetheringNetworkFactory.java
index 51058e115..9b735cf15 100644
--- a/src/com/android/bluetooth/pan/BluetoothTetheringNetworkFactory.java
+++ b/src/com/android/bluetooth/pan/BluetoothTetheringNetworkFactory.java
@@ -85,6 +85,7 @@ public class BluetoothTetheringNetworkFactory extends NetworkFactory {
         // of IpManager. This will likely necessitate a rethink about
         // NetworkAgent, NetworkInfo, and associated instance lifetimes.
         Thread ipProvisioningThread = new Thread(new Runnable() {
+            @Override
             public void run() {
                 LinkProperties linkProperties;
                 final WaitForProvisioningCallback ipmCallback = new WaitForProvisioningCallback() {
@@ -130,6 +131,7 @@ public class BluetoothTetheringNetworkFactory extends NetworkFactory {
                     // Create our NetworkAgent.
                     mNetworkAgent = new NetworkAgent(getLooper(), mContext, NETWORK_TYPE,
                             mNetworkInfo, mNetworkCapabilities, linkProperties, NETWORK_SCORE) {
+                        @Override
                         public void unwanted() {
                             BluetoothTetheringNetworkFactory.this.onCancelRequest();
                         };
diff --git a/src/com/android/bluetooth/pan/PanService.java b/src/com/android/bluetooth/pan/PanService.java
index 1b44608b6..30f96a6f1 100755
--- a/src/com/android/bluetooth/pan/PanService.java
+++ b/src/com/android/bluetooth/pan/PanService.java
@@ -78,10 +78,12 @@ public class PanService extends ProfileService {
         classInitNative();
     }
 
+    @Override
     protected String getName() {
         return TAG;
     }
 
+    @Override
     public IProfileServiceBinder initBinder() {
         return new BluetoothPanBinder(this);
     }
@@ -120,6 +122,7 @@ public class PanService extends ProfileService {
         }
     }
 
+    @Override
     protected boolean start() {
         mPanDevices = new HashMap<BluetoothDevice, BluetoothPanDevice>();
         mBluetoothIfaceAddresses = new ArrayList<String>();
@@ -139,11 +142,13 @@ public class PanService extends ProfileService {
         return true;
     }
 
+    @Override
     protected boolean stop() {
         mHandler.removeCallbacksAndMessages(null);
         return true;
     }
 
+    @Override
     protected boolean cleanup() {
         if (mNativeAvailable) {
             cleanupNative();
@@ -217,6 +222,7 @@ public class PanService extends ProfileService {
         public BluetoothPanBinder(PanService svc) {
             mService = svc;
         }
+        @Override
         public boolean cleanup() {
             mService = null;
             return true;
@@ -232,16 +238,19 @@ public class PanService extends ProfileService {
             }
             return null;
         }
+        @Override
         public boolean connect(BluetoothDevice device) {
             PanService service = getService();
             if (service == null) return false;
             return service.connect(device);
         }
+        @Override
         public boolean disconnect(BluetoothDevice device) {
             PanService service = getService();
             if (service == null) return false;
             return service.disconnect(device);
         }
+        @Override
         public int getConnectionState(BluetoothDevice device) {
             PanService service = getService();
             if (service == null) return BluetoothPan.STATE_DISCONNECTED;
@@ -258,12 +267,14 @@ public class PanService extends ProfileService {
             if (service == null) return false;
             return service.isPanUOn();
         }
+        @Override
         public boolean isTetheringOn() {
             // TODO(BT) have a variable marking the on/off state
             PanService service = getService();
             if (service == null) return false;
             return service.isTetheringOn();
         }
+        @Override
         public void setBluetoothTethering(boolean value) {
             PanService service = getService();
             if (service == null) return;
@@ -271,12 +282,14 @@ public class PanService extends ProfileService {
             service.setBluetoothTethering(value);
         }
 
+        @Override
         public List<BluetoothDevice> getConnectedDevices() {
             PanService service = getService();
             if (service == null) return new ArrayList<BluetoothDevice>(0);
             return service.getConnectedDevices();
         }
 
+        @Override
         public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
             PanService service = getService();
             if (service == null) return new ArrayList<BluetoothDevice>(0);
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapActivity.java b/src/com/android/bluetooth/pbap/BluetoothPbapActivity.java
index b841aafe1..928439489 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapActivity.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapActivity.java
@@ -209,6 +209,7 @@ public class BluetoothPbapActivity extends AlertActivity implements
         sendBroadcast(intent);
     }
 
+    @Override
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
             case DialogInterface.BUTTON_POSITIVE:
@@ -264,16 +265,20 @@ public class BluetoothPbapActivity extends AlertActivity implements
         unregisterReceiver(mReceiver);
     }
 
+    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         return true;
     }
 
+    @Override
     public void beforeTextChanged(CharSequence s, int start, int before, int after) {
     }
 
+    @Override
     public void onTextChanged(CharSequence s, int start, int before, int count) {
     }
 
+    @Override
     public void afterTextChanged(android.text.Editable s) {
         if (s.length() > 0) {
             mOkButton.setEnabled(true);
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapAuthenticator.java b/src/com/android/bluetooth/pbap/BluetoothPbapAuthenticator.java
index e9cca90e4..110d2e586 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapAuthenticator.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapAuthenticator.java
@@ -88,6 +88,7 @@ public class BluetoothPbapAuthenticator implements Authenticator {
         }
     }
 
+    @Override
     public PasswordAuthentication onAuthenticationChallenge(final String description,
             final boolean isUserIdRequired, final boolean isFullAccess) {
         waitUserConfirmation();
@@ -99,6 +100,7 @@ public class BluetoothPbapAuthenticator implements Authenticator {
     }
 
     // TODO: Reserved for future use only, in case PSE challenge PCE
+    @Override
     public byte[] onAuthenticationResponse(final byte[] userName) {
         byte[] b = null;
         return b;
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java b/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
index d12e6a9ab..b1fe61b7a 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
@@ -1203,6 +1203,7 @@ public class BluetoothPbapObexServer extends ServerRequestHandler {
 
     // Reserved for future use. In case PSE challenge PCE and PCE input wrong
     // session key.
+    @Override
     public final void onAuthenticationFailure(final byte[] userName) {
     }
 
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapService.java b/src/com/android/bluetooth/pbap/BluetoothPbapService.java
index 11caa8736..59e3b2366 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapService.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapService.java
@@ -921,11 +921,13 @@ public class BluetoothPbapService extends ProfileService implements IObexConnect
             mService = service;
         }
 
+        @Override
         public boolean cleanup() {
             mService = null;
             return true;
         }
 
+        @Override
         public int getState() {
             if (DEBUG) Log.d(TAG, "getState = " + mService.getState());
             BluetoothPbapService service = getService(BLUETOOTH_PERM);
@@ -934,6 +936,7 @@ public class BluetoothPbapService extends ProfileService implements IObexConnect
             return service.getState();
         }
 
+        @Override
         public BluetoothDevice getClient() {
             if (DEBUG) Log.d(TAG, "getClient = " + mService.getRemoteDevice());
             BluetoothPbapService service = getService(BLUETOOTH_PERM);
@@ -941,6 +944,7 @@ public class BluetoothPbapService extends ProfileService implements IObexConnect
             return service.getRemoteDevice();
         }
 
+        @Override
         public boolean isConnected(BluetoothDevice device) {
             if (DEBUG) Log.d(TAG, "isConnected " + device);
             BluetoothPbapService service = getService(BLUETOOTH_PERM);
@@ -949,11 +953,13 @@ public class BluetoothPbapService extends ProfileService implements IObexConnect
                     && service.getRemoteDevice().equals(device);
         }
 
+        @Override
         public boolean connect(BluetoothDevice device) {
             BluetoothPbapService service = getService(BLUETOOTH_ADMIN_PERM);
             return false;
         }
 
+        @Override
         public void disconnect() {
             if (DEBUG) Log.d(TAG, "disconnect");
             BluetoothPbapService service = getService(BLUETOOTH_ADMIN_PERM);
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java b/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
index d2c4a08af..7a4b07ca3 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
@@ -310,6 +310,7 @@ public class BluetoothPbapVcardManager {
         composer = BluetoothPbapUtils.createFilteredVCardComposer(mContext, vcardType, null);
         composer.setPhoneNumberTranslationCallback(new VCardPhoneNumberTranslationCallback() {
 
+            @Override
             public String onValueReceived(
                     String rawValue, int type, String label, boolean isPrimary) {
                 String numberWithControlSequence = rawValue.replace(PhoneNumberUtils.PAUSE, 'p')
@@ -694,6 +695,7 @@ public class BluetoothPbapVcardManager {
             // other formatting
             // done by vCard library by default.
             composer.setPhoneNumberTranslationCallback(new VCardPhoneNumberTranslationCallback() {
+                @Override
                 public String onValueReceived(String rawValue, int type, String label,
                         boolean isPrimary) {
                     // 'p' and 'w' are the standard characters for pause and
@@ -786,6 +788,7 @@ public class BluetoothPbapVcardManager {
             /* BT does want PAUSE/WAIT conversion while it doesn't want the
              * other formatting done by vCard library by default. */
             composer.setPhoneNumberTranslationCallback(new VCardPhoneNumberTranslationCallback() {
+                @Override
                 public String onValueReceived(
                         String rawValue, int type, String label, boolean isPrimary) {
                     /* 'p' and 'w' are the standard characters for pause and wait
diff --git a/src/com/android/bluetooth/sap/SapRilReceiver.java b/src/com/android/bluetooth/sap/SapRilReceiver.java
index ed1f8690b..11b642592 100644
--- a/src/com/android/bluetooth/sap/SapRilReceiver.java
+++ b/src/com/android/bluetooth/sap/SapRilReceiver.java
@@ -74,6 +74,7 @@ public class SapRilReceiver {
     }
 
     class SapCallback extends ISapCallback.Stub {
+        @Override
         public void connectResponse(int token, int sapConnectRsp, int maxMsgSize) {
             Log.d(TAG, "connectResponse: token " + token + " sapConnectRsp " + sapConnectRsp
                             + " maxMsgSize " + maxMsgSize);
@@ -87,6 +88,7 @@ public class SapRilReceiver {
             removeOngoingReqAndSendMessage(token, sapMessage);
         }
 
+        @Override
         public void disconnectResponse(int token) {
             Log.d(TAG, "disconnectResponse: token " + token);
             SapService.notifyUpdateWakeLock(mSapServiceHandler);
@@ -95,6 +97,7 @@ public class SapRilReceiver {
             removeOngoingReqAndSendMessage(token, sapMessage);
         }
 
+        @Override
         public void disconnectIndication(int token, int disconnectType) {
             Log.d(TAG,
                     "disconnectIndication: token " + token + " disconnectType " + disconnectType);
@@ -104,6 +107,7 @@ public class SapRilReceiver {
             sendSapMessage(sapMessage);
         }
 
+        @Override
         public void apduResponse(int token, int resultCode, ArrayList<Byte> apduRsp) {
             Log.d(TAG, "apduResponse: token " + token);
             SapService.notifyUpdateWakeLock(mSapServiceHandler);
@@ -115,6 +119,7 @@ public class SapRilReceiver {
             removeOngoingReqAndSendMessage(token, sapMessage);
         }
 
+        @Override
         public void transferAtrResponse(int token, int resultCode, ArrayList<Byte> atr) {
             Log.d(TAG, "transferAtrResponse: token " + token + " resultCode " + resultCode);
             SapService.notifyUpdateWakeLock(mSapServiceHandler);
@@ -126,6 +131,7 @@ public class SapRilReceiver {
             removeOngoingReqAndSendMessage(token, sapMessage);
         }
 
+        @Override
         public void powerResponse(int token, int resultCode) {
             Log.d(TAG, "powerResponse: token " + token + " resultCode " + resultCode);
             SapService.notifyUpdateWakeLock(mSapServiceHandler);
@@ -146,6 +152,7 @@ public class SapRilReceiver {
             sendSapMessage(sapMessage);
         }
 
+        @Override
         public void resetSimResponse(int token, int resultCode) {
             Log.d(TAG, "resetSimResponse: token " + token + " resultCode " + resultCode);
             SapService.notifyUpdateWakeLock(mSapServiceHandler);
@@ -154,6 +161,7 @@ public class SapRilReceiver {
             removeOngoingReqAndSendMessage(token, sapMessage);
         }
 
+        @Override
         public void statusIndication(int token, int status) {
             Log.d(TAG, "statusIndication: token " + token + " status " + status);
             SapService.notifyUpdateWakeLock(mSapServiceHandler);
@@ -162,6 +170,7 @@ public class SapRilReceiver {
             sendSapMessage(sapMessage);
         }
 
+        @Override
         public void transferCardReaderStatusResponse(
                 int token, int resultCode, int cardReaderStatus) {
             Log.d(TAG, "transferCardReaderStatusResponse: token " + token + " resultCode "
@@ -175,6 +184,7 @@ public class SapRilReceiver {
             removeOngoingReqAndSendMessage(token, sapMessage);
         }
 
+        @Override
         public void errorResponse(int token) {
             Log.d(TAG, "errorResponse: token " + token);
             SapService.notifyUpdateWakeLock(mSapServiceHandler);
@@ -184,6 +194,7 @@ public class SapRilReceiver {
             sendSapMessage(sapMessage);
         }
 
+        @Override
         public void transferProtocolResponse(int token, int resultCode) {
             Log.d(TAG, "transferProtocolResponse: token " + token + " resultCode " + resultCode);
             SapService.notifyUpdateWakeLock(mSapServiceHandler);
diff --git a/src/com/android/bluetooth/sap/SapService.java b/src/com/android/bluetooth/sap/SapService.java
index 3804d64e1..dba18ea20 100644
--- a/src/com/android/bluetooth/sap/SapService.java
+++ b/src/com/android/bluetooth/sap/SapService.java
@@ -601,6 +601,7 @@ public class SapService extends ProfileService {
         return true;
     }
 
+    @Override
     public boolean cleanup()  {
         setState(BluetoothSap.STATE_DISCONNECTED, BluetoothSap.RESULT_CANCELED);
         closeService();
@@ -792,11 +793,13 @@ public class SapService extends ProfileService {
             mService = service;
         }
 
+        @Override
         public boolean cleanup()  {
             mService = null;
             return true;
         }
 
+        @Override
         public int getState() {
             Log.v(TAG, "getState()");
             SapService service = getService();
@@ -804,6 +807,7 @@ public class SapService extends ProfileService {
             return getService().getState();
         }
 
+        @Override
         public BluetoothDevice getClient() {
             Log.v(TAG, "getClient()");
             SapService service = getService();
@@ -812,6 +816,7 @@ public class SapService extends ProfileService {
             return service.getRemoteDevice();
         }
 
+        @Override
         public boolean isConnected(BluetoothDevice device) {
             Log.v(TAG, "isConnected()");
             SapService service = getService();
@@ -820,6 +825,7 @@ public class SapService extends ProfileService {
                     && service.getRemoteDevice().equals(device));
         }
 
+        @Override
         public boolean connect(BluetoothDevice device) {
             Log.v(TAG, "connect()");
             SapService service = getService();
@@ -827,6 +833,7 @@ public class SapService extends ProfileService {
             return false;
         }
 
+        @Override
         public boolean disconnect(BluetoothDevice device) {
             Log.v(TAG, "disconnect()");
             SapService service = getService();
@@ -834,6 +841,7 @@ public class SapService extends ProfileService {
             return service.disconnect(device);
         }
 
+        @Override
         public List<BluetoothDevice> getConnectedDevices() {
             Log.v(TAG, "getConnectedDevices()");
             SapService service = getService();
@@ -841,6 +849,7 @@ public class SapService extends ProfileService {
             return service.getConnectedDevices();
         }
 
+        @Override
         public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
             Log.v(TAG, "getDevicesMatchingConnectionStates()");
             SapService service = getService();
@@ -848,6 +857,7 @@ public class SapService extends ProfileService {
             return service.getDevicesMatchingConnectionStates(states);
         }
 
+        @Override
         public int getConnectionState(BluetoothDevice device) {
             Log.v(TAG, "getConnectionState()");
             SapService service = getService();
@@ -855,12 +865,14 @@ public class SapService extends ProfileService {
             return service.getConnectionState(device);
         }
 
+        @Override
         public boolean setPriority(BluetoothDevice device, int priority) {
             SapService service = getService();
             if (service == null) return false;
             return service.setPriority(device, priority);
         }
 
+        @Override
         public int getPriority(BluetoothDevice device) {
             SapService service = getService();
             if (service == null) return BluetoothProfile.PRIORITY_UNDEFINED;
diff --git a/tests/src/com/android/bluetooth/a2dpsink/A2dpSinkStreamHandlerTest.java b/tests/src/com/android/bluetooth/a2dpsink/A2dpSinkStreamHandlerTest.java
index efa17ac6a..b5a1f6876 100644
--- a/tests/src/com/android/bluetooth/a2dpsink/A2dpSinkStreamHandlerTest.java
+++ b/tests/src/com/android/bluetooth/a2dpsink/A2dpSinkStreamHandlerTest.java
@@ -61,6 +61,7 @@ public class A2dpSinkStreamHandlerTest extends AndroidTestCase {
 
     @Mock PackageManager mockPackageManager;
 
+    @Override
     @Before
     public void setUp() {
         // Mock the looper
diff --git a/tests/src/com/android/bluetooth/pbapclient/PbapParserTest.java b/tests/src/com/android/bluetooth/pbapclient/PbapParserTest.java
index 4f0841157..d3bf5c18d 100644
--- a/tests/src/com/android/bluetooth/pbapclient/PbapParserTest.java
+++ b/tests/src/com/android/bluetooth/pbapclient/PbapParserTest.java
@@ -37,6 +37,7 @@ public class PbapParserTest extends AndroidTestCase {
     private static final String mTestAccountName = "PBAPTESTACCOUNT";
     private static final String mTestPackageName = "com.android.bluetooth.tests";
 
+    @Override
     @Before
     public void setUp() {
         mAccount = new Account(mTestAccountName,