From c0b125d5a59a6a198da9ee86d53e01d66edfd865 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Thu, 31 Dec 2015 15:50:16 +0100
Subject: [PATCH] Remove pre Android 4.x leftovers

---
 .../android/vanilla/CompatHoneycomb.java      | 24 -------------------
 .../android/vanilla/MediaUtils.java           |  2 +-
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/src/ch/blinkenlights/android/vanilla/CompatHoneycomb.java b/src/ch/blinkenlights/android/vanilla/CompatHoneycomb.java
index 839f121b..9abb5570 100644
--- a/src/ch/blinkenlights/android/vanilla/CompatHoneycomb.java
+++ b/src/ch/blinkenlights/android/vanilla/CompatHoneycomb.java
@@ -90,28 +90,4 @@ public class CompatHoneycomb {
 		}
 	}
 
-	/**
-	 * Call {@link android.provider.MediaStore.Audio.Genres#getContentUriForAudioId(String,int)}
-	 * on the external volume.
-	 */
-	public static Uri getContentUriForAudioId(int id)
-	{
-		return MediaStore.Audio.Genres.getContentUriForAudioId("external", id);
-	}
-
-	/**
-	 * Call {@link KeyEvent#hasNoModifiers()}.
-	 */
-	public static boolean hasNoModifiers(KeyEvent event)
-	{
-		return event.hasNoModifiers();
-	}
-
-	/**
-	 * Call {@link KeyEvent#hasModifiers(int)}.
-	 */
-	public static boolean hasModifiers(KeyEvent event, int modifiers)
-	{
-		return event.hasModifiers(modifiers);
-	}
 }
diff --git a/src/ch/blinkenlights/android/vanilla/MediaUtils.java b/src/ch/blinkenlights/android/vanilla/MediaUtils.java
index da494ed5..e5568d6a 100644
--- a/src/ch/blinkenlights/android/vanilla/MediaUtils.java
+++ b/src/ch/blinkenlights/android/vanilla/MediaUtils.java
@@ -283,7 +283,7 @@ public class MediaUtils {
 	public static long queryGenreForSong(ContentResolver resolver, long id)
 	{
 		String[] projection = { "_id" };
-		Uri uri = CompatHoneycomb.getContentUriForAudioId((int)id);
+		Uri uri = MediaStore.Audio.Genres.getContentUriForAudioId("external", (int)id);
 		Cursor cursor = queryResolver(resolver, uri, projection, null, null, null);
 		
 		if (cursor != null) {