Android: More deprecation fixes

android/build.gradle.kts

@@ -117,7 +117,7 @@ android {
 		applicationId = "org.ppsspp.ppsspp"
 		// Access the git version info via the extension
 		if (gitVersionName != "unknown") {
-			println("Overriding Android Version Name, Code: $gitVersionName $gitVersionCode")
+			println("INFO: Overriding Android Version Name, Code: $gitVersionName $gitVersionCode")
 			versionName = gitVersionName
 			versionCode = gitVersionCode
 		} else {
@@ -164,24 +164,24 @@ android {
 	sourceSets {
 		getByName("main") {
 			manifest.srcFile("AndroidManifest.xml")
-			res.setSrcDirs(listOf("res"))
-			java.setSrcDirs(listOf("src"))
-			aidl.setSrcDirs(listOf("src"))
-			resources.setSrcDirs(listOf("src"))
-			assets.setSrcDirs(listOf("../assets"))
+			res.directories.add("res")
+			java.directories.add("src")
+			aidl.directories.add("src")
+			resources.directories.add("src")
+			assets.directories.add("../assets")
 		}
 		create("normal") {
-			res.setSrcDirs(listOf("normal/res"))
+			res.directories.add("normal/res")
 		}
 		create("gold") {
-			res.setSrcDirs(listOf("gold/res"))
+			res.directories.add("gold/res")
 		}
 		create("vr") {
-			res.setSrcDirs(listOf("normal/res"))
+			res.directories.add("normal/res")
 			manifest.srcFile("VRManifest.xml")
 		}
 		create("legacy") {
-			res.setSrcDirs(listOf("legacy/res"))
+			res.directories.add("legacy/res")
 		}
 	}
 	productFlavors {
@@ -286,8 +286,9 @@ androidComponents {
 	}
 }
 
+/*
 afterEvaluate {
 	android.sourceSets.getByName("main").assets.srcDirs.forEach {
 		println(it)
 	}
-}
+}*/

android/src/org/ppsspp/ppsspp/LocationHelper.java

@@ -37,6 +37,7 @@ class LocationHelper implements LocationListener {
 		mLocationEnable = false;
 	}
 
+	@SuppressWarnings("deprecation")
 	void startLocationUpdates() {
 		Log.d(TAG, "startLocationUpdates");
 		if (!mLocationEnable) {
@@ -89,6 +90,7 @@ class LocationHelper implements LocationListener {
 		}
 	}
 
+	@SuppressWarnings("deprecation")
 	void stopLocationUpdates() {
 		Log.d(TAG, "stopLocationUpdates");
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -160,6 +162,7 @@ class LocationHelper implements LocationListener {
 		}
 	}
 
+	@SuppressWarnings("deprecation")
 	private void onGpsStatus(int event) {
 		switch (event) {
 			case GpsStatus.GPS_EVENT_STARTED:
@@ -169,6 +172,7 @@ class LocationHelper implements LocationListener {
 			case GpsStatus.GPS_EVENT_SATELLITE_STATUS: {
 				try {
 					GpsStatus gpsStatus = mLocationManager.getGpsStatus(null);
+					if (gpsStatus == null) return;
 					Iterable<GpsSatellite> satellites = gpsStatus.getSatellites();
 
 					short index = 0;
@@ -197,10 +201,18 @@ class LocationHelper implements LocationListener {
 			return;
 		}
 		if (!tokens[GPGGA_HDOP_INDEX].isEmpty()) {
-			mHdop = Float.valueOf(tokens[GPGGA_HDOP_INDEX]);
+			try {
+				mHdop = Float.parseFloat(tokens[GPGGA_HDOP_INDEX]);
+			} catch (NumberFormatException e) {
+				// Ignore
+			}
 		}
 		if (!tokens[GPGGA_ALTITUDE_INDEX].isEmpty()) {
-			mAltitudeAboveSeaLevel = Float.valueOf(tokens[GPGGA_ALTITUDE_INDEX]);
+			try {
+				mAltitudeAboveSeaLevel = Float.parseFloat(tokens[GPGGA_ALTITUDE_INDEX]);
+			} catch (NumberFormatException e) {
+				// Ignore
+			}
 		}
 	}
 }