Target SDK 35

Author: p1gp1g

build.gradle

@@ -38,7 +38,7 @@ buildscript {
 
     ext.androidMinSdk = 19
     ext.androidTargetSdk = 29
-    ext.androidCompileSdk = 34
+    ext.androidCompileSdk = 35
 
     ext.localProperties = new Properties()
 

play-services-auth-workaccount/core/src/main/kotlin/org/microg/gms/auth/workaccount/WorkAccountService.kt

@@ -114,8 +114,8 @@ class WorkAccountServiceImpl(val context: Context) : IWorkAccountService.Stub()
                 future.result.let { result ->
                     callback?.onAccountAdded(
                         Account(
-                            result.getString(AccountManager.KEY_ACCOUNT_NAME),
-                            result.getString(AccountManager.KEY_ACCOUNT_TYPE)
+                            result.getString(AccountManager.KEY_ACCOUNT_NAME)!!,
+                            result.getString(AccountManager.KEY_ACCOUNT_TYPE)!!
                         )
                     )
                 }

play-services-base/core/src/main/kotlin/org/microg/gms/utils/PackageManagerUtils.kt

@@ -17,14 +17,16 @@ fun PackageManager.isPlatformCertificate(cert: CertData) = getPlatformCertificat
 fun PackageManager.getPlatformCertificates() = getCertificates("android")
 
 fun PackageManager.getCertificates(packageName: String): List<CertData> = try {
-    getPackageInfo(packageName, PackageManager.GET_SIGNATURES).signatures.map { CertData(it.toByteArray()) }
+    getPackageInfo(packageName, PackageManager.GET_SIGNATURES).signatures?.map { CertData(it.toByteArray()) }
+        ?: emptyList()
 } catch (e: NameNotFoundException) {
     emptyList()
 }
 
 @Deprecated("It's actually a certificate", ReplaceWith("getCertificates"))
 fun PackageManager.getSignatures(packageName: String): Array<Signature> = try {
     getPackageInfo(packageName, PackageManager.GET_SIGNATURES).signatures
+        ?: emptyArray()
 } catch (e: NameNotFoundException) {
     emptyArray()
 }

play-services-base/core/src/main/res/values/themes.xml

@@ -70,7 +70,7 @@
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowAnimationStyle">@android:style/Animation</item>
         <!-- Workaround until edge-to-edge is implemented, useful for libraries used in app targeting SDK35 -->
-        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
+        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:ignore="UnusedAttribute">true</item>
     </style>
 
     <!-- Switch Bar -->

play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/provider/extensions.kt

@@ -24,5 +24,5 @@ val GeocoderParams.clientIdentity: ClientIdentity?
         }
     }
 
-val Context.versionName: String
+val Context.versionName: String?
     get() = packageManager.getPackageInfo(packageName, 0).versionName

play-services-nearby/core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ui/ExposureNotificationsConfirmActivity.kt

@@ -122,8 +122,8 @@ class ExposureNotificationsConfirmActivity : AppCompatActivity() {
                 // https://developer.android.com/guide/topics/connectivity/bluetooth/permissions#assert-never-for-location
                 try {
                     val packageInfo = packageManager.getPackageInfo(packageName, PackageManager.GET_PERMISSIONS)
-                    val bluetoothScanIndex = packageInfo.requestedPermissions.indexOf(BLUETOOTH_SCAN)
-                    if (packageInfo.requestedPermissionsFlags[bluetoothScanIndex] and REQUESTED_PERMISSION_NEVER_FOR_LOCATION > 0) {
+                    val bluetoothScanIndex = packageInfo.requestedPermissions!!.indexOf(BLUETOOTH_SCAN)
+                    if (packageInfo.requestedPermissionsFlags!![bluetoothScanIndex] and REQUESTED_PERMISSION_NEVER_FOR_LOCATION > 0) {
                         return arrayOf(BLUETOOTH_ADVERTISE, BLUETOOTH_SCAN)
                     }
                 } catch (e: Exception) {

vending-app/src/main/java/com/android/vending/licensing/LicensingService.kt

@@ -115,7 +115,7 @@ class LicensingService : Service() {
             }
 
             // Verify caller identity
-            if (packageInfo.applicationInfo.uid != callingUid) {
+            if (packageInfo.applicationInfo?.uid != callingUid) {
                 Log.e(
                     TAG,
                     "an app illegally tried to request licenses for another app (caller: $callingUid)"
@@ -165,17 +165,19 @@ class LicensingService : Service() {
             try {
                 Log.e(TAG, "not checking license, as user is not signed in")
 
-                packageManager.getPackageInfo(packageName, 0).let {
+                packageManager.getPackageInfo(packageName, 0)!!.let {
                     sendLicenseServiceNotification(
                         packageName,
-                        packageManager.getApplicationLabel(it.applicationInfo),
-                        it.applicationInfo.uid
+                        packageManager.getApplicationLabel(it.applicationInfo!!),
+                        it.applicationInfo!!.uid
                     )
                 }
 
             } catch (e: PackageManager.NameNotFoundException) {
                 Log.e(TAG, "ignored license request, but package name $packageName was not known!")
                 // don't send sign in notification
+            } catch (e: NullPointerException) {
+                Log.e(TAG, "ignored license request, but couldn't get package info for $packageName")
             }
         }
     }

vending-app/src/main/java/org/microg/vending/billing/Utils.kt

@@ -314,7 +314,7 @@ fun createDeviceEnvInfo(context: Context): DeviceEnvInfo? {
             userAgent = getUserAgent(),
             gpLastUpdateTime = packageInfo.lastUpdateTime,
             gpFirstInstallTime = packageInfo.firstInstallTime,
-            gpSourceDir = packageInfo.applicationInfo.sourceDir!!,
+            gpSourceDir = packageInfo.applicationInfo!!.sourceDir!!,
             device = Build.DEVICE ?: "",
             displayMetrics = getDisplayInfo(context),
             telephonyData = getTelephonyData(context),

vending-app/src/main/java/org/microg/vending/ui/InstallProgressNotification.kt

@@ -27,11 +27,14 @@ private const val INSTALL_NOTIFICATION_CHANNEL_ID = "packageInstall"
 internal fun Context.notifySplitInstallProgress(packageName: String, sessionId: Int, progress: InstallProgress) {
 
     val label = try {
-        packageManager.getPackageInfo(packageName, 0).applicationInfo
+        packageManager.getPackageInfo(packageName, 0).applicationInfo!!
             .loadLabel(packageManager)
     } catch (e: NameNotFoundException) {
         Log.e(TAG, "Couldn't load label for $packageName (${e.message}). Is it not installed?")
         return
+    } catch (e: NullPointerException) {
+        Log.e(TAG, "Couldn't get application info for $packageName (${e.message})")
+        return
     }
 
     createNotificationChannel()

vending-app/src/main/java/org/microg/vending/ui/WorkAppsActivity.kt

@@ -211,7 +211,7 @@ class WorkAppsActivity : ComponentActivity() {
                     ).getItemsResponses.mapNotNull { it.response }.associate { item ->
                         val packageName = item.meta!!.packageName!!
                         val installedDetails = this@WorkAppsActivity.packageManager.getInstalledPackages(0).find {
-                            it.applicationInfo.packageName == packageName
+                            it.applicationInfo?.packageName == packageName
                         }
 
                         val available = item.offer?.delivery != null