Bump target API level to 22.

demo/src/main/AndroidManifest.xml

@@ -25,7 +25,7 @@
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
 
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21"/>
+  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22"/>
 
 
   <application
   <application
       android:label="@string/application_name"
       android:label="@string/application_name"

demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java

@@ -25,7 +25,6 @@ import java.net.CookieHandler;
 import java.net.CookieManager;
 import java.net.CookieManager;
 import java.net.CookiePolicy;
 import java.net.CookiePolicy;
 import java.net.HttpURLConnection;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URL;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -52,7 +51,7 @@ public class DemoUtil {
   }
   }
 
 
   public static byte[] executePost(String url, byte[] data, Map<String, String> requestProperties)
   public static byte[] executePost(String url, byte[] data, Map<String, String> requestProperties)
-      throws MalformedURLException, IOException {
+      throws IOException {
     HttpURLConnection urlConnection = null;
     HttpURLConnection urlConnection = null;
     try {
     try {
       urlConnection = (HttpURLConnection) new URL(url).openConnection();
       urlConnection = (HttpURLConnection) new URL(url).openConnection();

demo/src/main/java/com/google/android/exoplayer/demo/WidevineTestMediaDrmCallback.java

@@ -22,8 +22,6 @@ import android.media.MediaDrm.KeyRequest;
 import android.media.MediaDrm.ProvisionRequest;
 import android.media.MediaDrm.ProvisionRequest;
 import android.text.TextUtils;
 import android.text.TextUtils;
 
 
-import org.apache.http.client.ClientProtocolException;
-
 import java.io.IOException;
 import java.io.IOException;
 import java.util.UUID;
 import java.util.UUID;
 
 
@@ -43,8 +41,7 @@ public class WidevineTestMediaDrmCallback implements MediaDrmCallback {
   }
   }
 
 
   @Override
   @Override
-  public byte[] executeProvisionRequest(UUID uuid, ProvisionRequest request)
-      throws ClientProtocolException, IOException {
+  public byte[] executeProvisionRequest(UUID uuid, ProvisionRequest request) throws IOException {
     String url = request.getDefaultUrl() + "&signedRequest=" + new String(request.getData());
     String url = request.getDefaultUrl() + "&signedRequest=" + new String(request.getData());
     return DemoUtil.executePost(url, null, null);
     return DemoUtil.executePost(url, null, null);
   }
   }

demo/src/main/project.properties

@@ -8,6 +8,6 @@
 # project structure.
 # project structure.
 
 
 # Project target.
 # Project target.
-target=android-21
+target=android-22
 android.library=false
 android.library=false
 android.library.reference.1=../../../library/src/main
 android.library.reference.1=../../../library/src/main

library/src/main/AndroidManifest.xml

@@ -27,6 +27,6 @@
     the library may be of use on older devices. However, please note that the core video playback
     the library may be of use on older devices. However, please note that the core video playback
     functionality provided by the library requires API level 16 or greater.
     functionality provided by the library requires API level 16 or greater.
   -->
   -->
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="21"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/>
 
 
 </manifest>
 </manifest>

library/src/main/project.properties

@@ -8,5 +8,5 @@
 # project structure.
 # project structure.
 
 
 # Project target.
 # Project target.
-target=android-21
+target=android-22
 android.library=true
 android.library=true

library/src/test/AndroidManifest.xml

@@ -17,7 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer.tests">
     package="com.google.android.exoplayer.tests">
 
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="21"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/>
 
 
   <application>
   <application>
     <uses-library android:name="android.test.runner"/>
     <uses-library android:name="android.test.runner"/>

library/src/test/project.properties

@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 
 # Project target.
 # Project target.
-target=android-21
+target=android-22