am 4c7a25ac: Merge "Optimize Opp Notification" into gingerbread (dc242a68) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/opp/BluetoothOppNotification.java

+51 −28

Original line number	Diff line number	Diff line
		@@ -43,6 +43,8 @@ import android.database.Cursor;
		import android.net.Uri;
		import android.util.Log;
		import android.widget.RemoteViews;
		import android.os.Handler;
		import android.os.Message;
		import android.os.Process;
		import java.util.HashMap;

		@@ -87,9 +89,7 @@ class BluetoothOppNotification {

		private NotificationUpdateThread mUpdateNotificationThread;

		private boolean mPendingUpdate = false;

		private boolean mFinised = false;
		private int mPendingUpdate = 0;

		private static final int NOTIFICATION_ID_OUTBOUND = -1000005;

		@@ -127,25 +127,51 @@ class BluetoothOppNotification {
		mNotifications = new HashMap<String, NotificationItem>();
		}

		public void finishNotification() {
		synchronized (BluetoothOppNotification.this) {
		mFinised = true;
		}
		}

		/**
		* Update the notification ui.
		*/
		public void updateNotification() {
		synchronized (BluetoothOppNotification.this) {
		mPendingUpdate = true;
		if (mUpdateNotificationThread == null) {
		mPendingUpdate++;
		if (mPendingUpdate > 1) {
		if (V) Log.v(TAG, "update too frequent, put in queue");
		return;
		}
		if (!mHandler.hasMessages(NOTIFY)) {
		if (V) Log.v(TAG, "send message");
		mHandler.sendMessage(mHandler.obtainMessage(NOTIFY));
		}
		}
		}

		private static final int NOTIFY = 0;
		// Use 1 second timer to limit notification frequency.
		// 1. On the first notification, create the update thread.
		// Buffer other updates.
		// 2. Update thread will clear mPendingUpdate.
		// 3. Handler sends a delayed message to self
		// 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() {
		public void handleMessage(Message msg) {
		switch (msg.what) {
		case NOTIFY:
		synchronized (BluetoothOppNotification.this) {
		if (mPendingUpdate > 0 && mUpdateNotificationThread == null) {
		if (V) Log.v(TAG, "new notify threadi!");
		mUpdateNotificationThread = new NotificationUpdateThread();
		mUpdateNotificationThread.start();
		mFinised = false;
		if (V) Log.v(TAG, "send delay message");
		mHandler.sendMessageDelayed(mHandler.obtainMessage(NOTIFY), 1000);
		} else if (mPendingUpdate > 0) {
		if (V) Log.v(TAG, "previous thread is not finished yet");
		mHandler.sendMessageDelayed(mHandler.obtainMessage(NOTIFY), 1000);
		}
		break;
		}
		}
		}
		};

		private class NotificationUpdateThread extends Thread {

		@@ -156,21 +182,18 @@ class BluetoothOppNotification {
		@Override
		public void run() {
		Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
		for (;;) {
		synchronized (BluetoothOppNotification.this) {
		if (mUpdateNotificationThread != this) {
		throw new IllegalStateException(
		"multiple UpdateThreads in BluetoothOppNotification");
		}
		if (!mPendingUpdate && mFinised) {
		mUpdateNotificationThread = null;
		return;
		}
		mPendingUpdate = false;
		mPendingUpdate = 0;
		}
		updateActiveNotification();
		updateCompletedNotification();
		updateIncomingFileConfirmNotification();
		synchronized (BluetoothOppNotification.this) {
		mUpdateNotificationThread = null;
		}
		}
		}

android/app/src/com/android/bluetooth/opp/BluetoothOppService.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -158,7 +158,6 @@ public class BluetoothOppService extends Service {
		mNotifier = new BluetoothOppNotification(this);
		mNotifier.mNotificationMgr.cancelAll();
		mNotifier.updateNotification();
		mNotifier.finishNotification();

		trimDatabase();

		@@ -316,7 +315,6 @@ public class BluetoothOppService extends Service {
		public void onDestroy() {
		if (V) Log.v(TAG, "Service onDestroy");
		super.onDestroy();
		mNotifier.finishNotification();
		getContentResolver().unregisterContentObserver(mObserver);
		unregisterReceiver(mBluetoothReceiver);
		mSocketListener.stop();
		@@ -391,8 +389,6 @@ public class BluetoothOppService extends Service {
		stopSelf();
		break;
		}
		mNotifier.updateNotification();
		mNotifier.finishNotification();
		return;
		}
		mPendingUpdate = false;

android/app/src/com/android/bluetooth/opp/BluetoothOppTransferHistory.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -285,7 +285,6 @@ public class BluetoothOppTransferHistory extends Activity implements
		if (!adapter.isEnabled()) {
		if (V) Log.v(TAG, "Bluetooth is not enabled, update notification manually.");
		mNotifier.updateNotification();
		mNotifier.finishNotification();
		}
		}
		}