Merge "Make notifications local-only" (09470691) · Commits · e / os / android_packages_modules_Bluetooth

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -383,6 +383,7 @@ class BluetoothOppNotification {
	}		}
	}		}
	b.setOngoing(true);		b.setOngoing(true);
			b.setLocalOnly(true);

	Intent intent = new Intent(Constants.ACTION_LIST);		Intent intent = new Intent(Constants.ACTION_LIST);
	intent.setClassName(Constants.THIS_PACKAGE_NAME, BluetoothOppReceiver.class.getName());		intent.setClassName(Constants.THIS_PACKAGE_NAME, BluetoothOppReceiver.class.getName());
	@@ -460,6 +461,7 @@ class BluetoothOppNotification {
	.setDeleteIntent(		.setDeleteIntent(
	PendingIntent.getBroadcast(mContext, 0, deleteIntent, 0))		PendingIntent.getBroadcast(mContext, 0, deleteIntent, 0))
	.setWhen(timeStamp)		.setWhen(timeStamp)
			.setLocalOnly(true)
	.build();		.build();
	mNotificationMgr.notify(NOTIFICATION_ID_OUTBOUND_COMPLETE, outNoti);		mNotificationMgr.notify(NOTIFICATION_ID_OUTBOUND_COMPLETE, outNoti);
	} else {		} else {
	@@ -525,6 +527,7 @@ class BluetoothOppNotification {
	.setDeleteIntent(		.setDeleteIntent(
	PendingIntent.getBroadcast(mContext, 0, deleteIntent, 0))		PendingIntent.getBroadcast(mContext, 0, deleteIntent, 0))
	.setWhen(timeStamp)		.setWhen(timeStamp)
			.setLocalOnly(true)
	.build();		.build();
	mNotificationMgr.notify(NOTIFICATION_ID_INBOUND_COMPLETE, inNoti);		mNotificationMgr.notify(NOTIFICATION_ID_INBOUND_COMPLETE, inNoti);
	} else {		} else {
	@@ -588,6 +591,7 @@ class BluetoothOppNotification {
	info.mDeviceName, info.mFileName)))		info.mDeviceName, info.mFileName)))
	.setContentInfo(Formatter.formatFileSize(mContext, info.mTotalBytes))		.setContentInfo(Formatter.formatFileSize(mContext, info.mTotalBytes))
	.setSmallIcon(R.drawable.bt_incomming_file_notification)		.setSmallIcon(R.drawable.bt_incomming_file_notification)
			.setLocalOnly(true)
	.build();		.build();
	mNotificationMgr.notify(NOTIFICATION_ID_PROGRESS, n);		mNotificationMgr.notify(NOTIFICATION_ID_PROGRESS, n);
	}		}

android/app/src/com/android/bluetooth/pbap/BluetoothPbapService.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -671,6 +671,7 @@ public class BluetoothPbapService extends ProfileService implements IObexConnect
	.setDefaults(Notification.DEFAULT_SOUND)		.setDefaults(Notification.DEFAULT_SOUND)
	.setContentIntent(PendingIntent.getActivity(this, 0, clickIntent, 0))		.setContentIntent(PendingIntent.getActivity(this, 0, clickIntent, 0))
	.setDeleteIntent(PendingIntent.getBroadcast(this, 0, deleteIntent, 0))		.setDeleteIntent(PendingIntent.getBroadcast(this, 0, deleteIntent, 0))
			.setLocalOnly(true)
	.build();		.build();
	nm.notify(NOTIFICATION_ID_AUTH, notification);		nm.notify(NOTIFICATION_ID_AUTH, notification);
	}		}

android/app/src/com/android/bluetooth/sap/SapServer.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -263,6 +263,7 @@ public class SapServer extends Thread implements Callback {
	.setAutoCancel(false)		.setAutoCancel(false)
	.setPriority(Notification.PRIORITY_MAX)		.setPriority(Notification.PRIORITY_MAX)
	.setOnlyAlertOnce(true)		.setOnlyAlertOnce(true)
			.setLocalOnly(true)
	.build();		.build();
	} else {		} else {
	sapDisconnectIntent.putExtra(SapServer.SAP_DISCONNECT_TYPE_EXTRA,		sapDisconnectIntent.putExtra(SapServer.SAP_DISCONNECT_TYPE_EXTRA,
	@@ -293,6 +294,7 @@ public class SapServer extends Thread implements Callback {
	.setAutoCancel(false)		.setAutoCancel(false)
	.setPriority(Notification.PRIORITY_MAX)		.setPriority(Notification.PRIORITY_MAX)
	.setOnlyAlertOnce(true)		.setOnlyAlertOnce(true)
			.setLocalOnly(true)
	.build();		.build();
	}		}