Merge "[Script] Remove final modifier from private methods" (b9526e35) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/map/BluetoothMapMasInstance.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -420,7 +420,7 @@ public class BluetoothMapMasInstance implements IObexConnectionHandler {
		}


		private final synchronized void closeServerSockets(boolean block) {
		private synchronized void closeServerSockets(boolean block) {
		// exit SocketAcceptThread early
		ObexServerSockets sockets = mServerSockets;
		if (sockets != null) {
		@@ -429,7 +429,7 @@ public class BluetoothMapMasInstance implements IObexConnectionHandler {
		}
		}

		private final synchronized void closeConnectionSocket() {
		private synchronized void closeConnectionSocket() {
		if (mConnSocket != null) {
		try {
		mConnSocket.close();

+1 −1

Original line number	Diff line number	Diff line
		@@ -1620,7 +1620,7 @@ public class BluetoothMapObexServer extends ServerRequestHandler {
		}
		}

		private static final void logHeader(HeaderSet hs) {
		private static void logHeader(HeaderSet hs) {
		Log.v(TAG, "Dumping HeaderSet " + hs.toString());
		try {
		Log.v(TAG, "CONNECTION_ID : " + hs.getHeader(HeaderSet.CONNECTION_ID));

+2 −2

Original line number	Diff line number	Diff line
		@@ -208,7 +208,7 @@ public class BluetoothMapService extends ProfileService {
		* Starts the RFComm listener threads for each MAS
		* @throws IOException
		*/
		private final void startRfcommSocketListeners(int masId) {
		private void startRfcommSocketListeners(int masId) {
		if(masId == -1) {
		for(int i=0, c=mMasInstances.size(); i < c; i++) {
		mMasInstances.valueAt(i).startRfcommSocketListener();
		@@ -226,7 +226,7 @@ public class BluetoothMapService extends ProfileService {
		/**
		* Start a MAS instance for SMS/MMS and each e-mail account.
		*/
		private final void startObexServerSessions() {
		private void startObexServerSessions() {
		if (DEBUG) Log.d(TAG, "Map Service START ObexServerSessions()");

		// acquire the wakeLock before start Obex transaction thread

+2 −2

Original line number	Diff line number	Diff line
		@@ -192,7 +192,7 @@ public class BluetoothOppLauncherActivity extends Activity {
		* Turns on Bluetooth if not already on, or launches device picker if Bluetooth is on
		* @return
		*/
		private final void launchDevicePicker() {
		private void launchDevicePicker() {
		// TODO: In the future, we may send intent to DevicePickerActivity
		// directly,
		// and let DevicePickerActivity to handle Bluetooth Enable.
		@@ -217,7 +217,7 @@ public class BluetoothOppLauncherActivity extends Activity {
		}
		}
		/* Returns true if Bluetooth is allowed given current airplane mode settings. */
		private final boolean isBluetoothAllowed() {
		private boolean isBluetoothAllowed() {
		final ContentResolver resolver = this.getContentResolver();

		// Check if airplane mode is on

+3 −3

Original line number	Diff line number	Diff line
		@@ -196,21 +196,21 @@ public final class BluetoothOppProvider extends ContentProvider {
		}
		}

		private static final void copyString(String key, ContentValues from, ContentValues to) {
		private static void copyString(String key, ContentValues from, ContentValues to) {
		String s = from.getAsString(key);
		if (s != null) {
		to.put(key, s);
		}
		}

		private static final void copyInteger(String key, ContentValues from, ContentValues to) {
		private static void copyInteger(String key, ContentValues from, ContentValues to) {
		Integer i = from.getAsInteger(key);
		if (i != null) {
		to.put(key, i);
		}
		}

		private static final void copyLong(String key, ContentValues from, ContentValues to) {
		private static void copyLong(String key, ContentValues from, ContentValues to) {
		Long i = from.getAsLong(key);
		if (i != null) {
		to.put(key, i);