diff options
| author | Jaikumar Ganesh <jaikumarg@android.com> | 2011-04-14 09:49:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-14 09:49:27 -0700 |
| commit | 3c68bca80f40710b70e3f9173cea167b30a8dcb4 (patch) | |
| tree | 5bda595b71e069dacbd4236ef4ec224a84d2940b | |
| parent | a4f55f7702bca57c0dbb543ee3e2cb1686e616fc (diff) | |
| parent | 138654ff978d6fc784003f87dfb5fda46a6a3703 (diff) | |
| download | android_packages_apps_Bluetooth-3c68bca80f40710b70e3f9173cea167b30a8dcb4.tar.gz android_packages_apps_Bluetooth-3c68bca80f40710b70e3f9173cea167b30a8dcb4.tar.bz2 android_packages_apps_Bluetooth-3c68bca80f40710b70e3f9173cea167b30a8dcb4.zip | |
am 138654ff: Merge "The phone did not reject unsupported vCalendar item"
* commit '138654ff978d6fc784003f87dfb5fda46a6a3703':
The phone did not reject unsupported vCalendar item
| -rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java b/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java index cb292c1b1..a58df0dda 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java +++ b/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java @@ -230,10 +230,13 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler implemen } // Reject policy: anything outside the "white list" plus unspecified - // MIME Types. + // MIME Types. Also reject everything in the "black list". if (!pre_reject - && (mimeType == null || (!Constants.mimeTypeMatches(mimeType, - Constants.ACCEPTABLE_SHARE_INBOUND_TYPES)))) { + && (mimeType == null + || !Constants.mimeTypeMatches(mimeType, + Constants.ACCEPTABLE_SHARE_INBOUND_TYPES) + || Constants.mimeTypeMatches(mimeType, + Constants.UNACCEPTABLE_SHARE_INBOUND_TYPES))) { if (D) Log.w(TAG, "mimeType is null or in unacceptable list, reject the transfer"); pre_reject = true; obexResponse = ResponseCodes.OBEX_HTTP_UNSUPPORTED_TYPE; |