Merge pull request #8870 from hrydgard/android-sdk-24

Update to target Android SDK platform 24 (N)
hrydgard · Jul 24, 2016 · fa3f219 · fa3f219
2 parents eb72a74 + 526d168
commit fa3f219
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 6 deletions.
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -7,7 +7,7 @@
 
     <uses-sdk
         android:minSdkVersion="9"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="24" />
 
     <uses-feature android:glEsVersion="0x00020000" />
     <uses-feature android:name="android.hardware.screen.landscape" android:required="false" />

diff --git a/android/project.properties b/android/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-23
+target=android-24
diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java
@@ -399,7 +399,6 @@ public void getDesiredBackbufferSize(Point sz) {
 		sz.y = NativeApp.getDesiredBackbufferHeight();
 	}
 
-    @SuppressWarnings("deprecation")
 	@Override
     public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);

diff --git a/android/src/org/ppsspp/ppsspp/NativeEGLConfigChooser.java b/android/src/org/ppsspp/ppsspp/NativeEGLConfigChooser.java
@@ -4,7 +4,6 @@
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.egl.EGLDisplay;
 
-import android.graphics.PixelFormat;
 import android.opengl.GLSurfaceView.EGLConfigChooser;
 import android.util.Log;
 

diff --git a/android/src/org/ppsspp/ppsspp/PpssppActivity.java b/android/src/org/ppsspp/ppsspp/PpssppActivity.java
@@ -2,7 +2,6 @@
 
 import android.app.AlertDialog;
 import android.content.Intent;
-import android.graphics.Point;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Looper;

diff --git a/android/src/org/ppsspp/ppsspp/ShortcutActivity.java b/android/src/org/ppsspp/ppsspp/ShortcutActivity.java
@@ -62,7 +62,6 @@ private void respondToShortcutRequest(String path) {
 
 	private void showBadGameMessage() {
 		new Thread() {
-			@SuppressWarnings("deprecation")
 			@Override
 			public void run() {
 				Looper.prepare();
@@ -85,6 +84,7 @@ public void run() {
 
 	// Event when a file is selected on file dialog.
 	private SimpleFileChooser.FileSelectedListener onFileSelectedListener = new SimpleFileChooser.FileSelectedListener() {
+		@Override
 		public void onFileSelected(File file) {
 			// create shortcut using file path
 			respondToShortcutRequest(file.getAbsolutePath());