Replace use of PendingIntent with PendingIntentCompat

This ensures FLAG_MUTABLE/FLAG_IMMUTABLE are used as required by platform

Author: mar-v-in

play-services-core/src/main/java/org/microg/gms/gcm/McsService.java

@@ -42,6 +42,7 @@
 
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.core.app.PendingIntentCompat;
 import androidx.legacy.content.WakefulBroadcastReceiver;
 
 import com.squareup.wire.Message;
@@ -176,7 +177,7 @@ public void onCreate() {
         super.onCreate();
         TriggerReceiver.register(this);
         database = new GcmDatabase(this);
-        heartbeatIntent = PendingIntent.getService(this, 0, new Intent(ACTION_HEARTBEAT, null, this, McsService.class), PendingIntent.FLAG_IMMUTABLE);
+        heartbeatIntent = PendingIntentCompat.getService(this, 0, new Intent(ACTION_HEARTBEAT, null, this, McsService.class), 0, false);
         alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
         powerManager = (PowerManager) getSystemService(POWER_SERVICE);
         if (SDK_INT >= 23 && checkSelfPermission("android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST") == PackageManager.PERMISSION_GRANTED) {
@@ -267,7 +268,7 @@ public static void scheduleReconnect(Context context) {
         AlarmManager alarmManager = (AlarmManager) context.getSystemService(ALARM_SERVICE);
         long delay = getCurrentDelay();
         logd(context, "Scheduling reconnect in " + delay / 1000 + " seconds...");
-        PendingIntent pi = PendingIntent.getBroadcast(context, 1, new Intent(ACTION_RECONNECT, null, context, TriggerReceiver.class), PendingIntent.FLAG_IMMUTABLE);
+        PendingIntent pi = PendingIntentCompat.getBroadcast(context, 1, new Intent(ACTION_RECONNECT, null, context, TriggerReceiver.class), 0, false);
         if (SDK_INT >= 23) {
             alarmManager.setExactAndAllowWhileIdle(ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + delay, pi);
         } else {

play-services-core/src/main/kotlin/org/microg/gms/accountaction/AccountNotification.kt

@@ -15,6 +15,7 @@ import androidx.annotation.RequiresApi
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.PendingIntentCompat
 import com.google.android.gms.R
 import org.microg.gms.auth.login.LoginActivity
 
@@ -29,8 +30,8 @@ fun Context.sendAccountReAuthNotification(account: Account) {
     val intent = Intent(this, LoginActivity::class.java).apply {
         putExtra(LoginActivity.EXTRA_RE_AUTH_ACCOUNT, account)
     }.let {
-        PendingIntent.getActivity(
-            this, account.hashCode(), it, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
+        PendingIntentCompat.getActivity(
+            this, account.hashCode(), it, PendingIntent.FLAG_CANCEL_CURRENT, false
         )
     }
 
@@ -57,12 +58,13 @@ fun Context.sendAccountActionNotification(account: Account, action: UserSatisfyR
 
     registerAccountNotificationChannel()
 
-    val intent: PendingIntent = AccountActionActivity.createIntent(this, account, action).let {
-        PendingIntent.getActivity(
+    val intent: PendingIntent? = AccountActionActivity.createIntent(this, account, action).let {
+        PendingIntentCompat.getActivity(
             this,
             account.hashCode(),
             it,
-            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
+            PendingIntent.FLAG_CANCEL_CURRENT,
+            false
         )
     }
 

play-services-core/src/main/kotlin/org/microg/gms/auth/folsom/KeyRetrievalService.kt

@@ -5,13 +5,12 @@
 
 package org.microg.gms.auth.folsom
 
-import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_IMMUTABLE
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.content.Context
 import android.content.Intent
 import android.os.Parcel
 import android.util.Log
+import androidx.core.app.PendingIntentCompat
 import com.google.android.gms.auth.folsom.RecoveryRequest
 import com.google.android.gms.auth.folsom.RecoveryResult
 import com.google.android.gms.auth.folsom.SharedKey
@@ -145,7 +144,7 @@ class KeyRetrievalServiceImpl(val context: Context) : IKeyRetrievalService.Stub(
     ) {
         Log.d(TAG, "Not implemented startUxFlow accountName:$accountName type:$type metadata:$metadata")
         val intent = Intent().apply { setClassName(GMS_PACKAGE_NAME, GenericActivity::class.java.name) }
-        val pendingIntent = PendingIntent.getActivity(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+        val pendingIntent = PendingIntentCompat.getActivity(context, 0, intent, FLAG_UPDATE_CURRENT, false)
         val states = Status(CommonStatusCodes.SUCCESS, "UX flow PendingIntent retrieved.", pendingIntent)
         callback?.onResult(states)
     }

play-services-core/src/main/kotlin/org/microg/gms/gcm/GcmInGmsService.kt

@@ -27,6 +27,7 @@ import android.util.Log
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.PendingIntentCompat
 import androidx.legacy.content.WakefulBroadcastReceiver
 import androidx.lifecycle.LifecycleService
 import androidx.lifecycle.lifecycleScope
@@ -214,7 +215,7 @@ class GcmInGmsService : LifecycleService() {
             intentExtras.forEach { putExtra(it.key, it.value_) }
         }
         val requestCode = intentExtras.hashCode()
-        val pendingIntent = PendingIntent.getActivity(this, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
+        val pendingIntent = PendingIntentCompat.getActivity(this, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT, false)
         val builder = NotificationCompat.Builder(this, CHANNEL_ID)
             .setContentTitle(content.accountName)
             .setContentText(content.description)
@@ -250,7 +251,7 @@ class GcmInGmsService : LifecycleService() {
         val intent = Intent(GcmConstants.ACTION_GCM_SEND).apply {
             setPackage(Constants.GMS_PACKAGE_NAME)
             putExtras(extras)
-            putExtra(GcmConstants.EXTRA_APP, Intent().apply { setPackage(Constants.GMS_PACKAGE_NAME) }.let { PendingIntent.getBroadcast(this@GcmInGmsService, 0, it, 0) })
+            putExtra(GcmConstants.EXTRA_APP, Intent().apply { setPackage(Constants.GMS_PACKAGE_NAME) }.let { PendingIntentCompat.getBroadcast(this@GcmInGmsService, 0, it, 0, false) })
         }.also {
             it.putExtra(GcmConstants.EXTRA_MESSENGER, Messenger(object : Handler(Looper.getMainLooper()) {
                 override fun handleMessage(msg: Message) {

play-services-fido/core/src/main/kotlin/org/microg/gms/fido/core/regular/Fido2AppService.kt

@@ -6,14 +6,13 @@
 package org.microg.gms.fido.core.regular
 
 import android.app.KeyguardManager
-import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_IMMUTABLE
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.content.Context
 import android.content.Context.KEYGUARD_SERVICE
 import android.content.Intent
 import android.os.Build.VERSION.SDK_INT
 import android.os.Parcel
+import androidx.core.app.PendingIntentCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
@@ -64,7 +63,7 @@ class Fido2AppServiceImpl(private val context: Context, override val lifecycle:
                 .putExtra(KEY_OPTIONS, options.serializeToBytes())
 
             val pendingIntent =
-                PendingIntent.getActivity(context, options.hashCode(), intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+                PendingIntentCompat.getActivity(context, options.hashCode(), intent, FLAG_UPDATE_CURRENT, false)
             callbacks.onPendingIntent(Status.SUCCESS, pendingIntent)
         }
     }
@@ -78,7 +77,7 @@ class Fido2AppServiceImpl(private val context: Context, override val lifecycle:
                 .putExtra(KEY_OPTIONS, options.serializeToBytes())
 
             val pendingIntent =
-                PendingIntent.getActivity(context, options.hashCode(), intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+                PendingIntentCompat.getActivity(context, options.hashCode(), intent, FLAG_UPDATE_CURRENT, false)
             callbacks.onPendingIntent(Status.SUCCESS, pendingIntent)
         }
     }

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

@@ -13,6 +13,7 @@ import android.util.Log
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.PendingIntentCompat
 import com.android.vending.R
 import java.util.TreeSet
 
@@ -51,17 +52,17 @@ fun Context.sendLicenseServiceNotification(
     val authIntent = Intent(this, SignInReceiver::class.java).apply {
         putExtra(INTENT_KEY_NOTIFICATION_ID, callerUid)
     }.let {
-        PendingIntent.getBroadcast(
-            this, callerUid * 2, it, PendingIntent.FLAG_IMMUTABLE
+        PendingIntentCompat.getBroadcast(
+            this, callerUid * 2, it, 0, false
         )
     }
 
     val ignoreIntent = Intent(this, IgnoreReceiver::class.java).apply {
         putExtra(INTENT_KEY_IGNORE_PACKAGE_NAME, callerPackageName)
         putExtra(INTENT_KEY_NOTIFICATION_ID, callerUid)
     }.let {
-        PendingIntent.getBroadcast(
-            this, callerUid * 2 + 1, it, PendingIntent.FLAG_MUTABLE
+        PendingIntentCompat.getBroadcast(
+            this, callerUid * 2 + 1, it, 0, true
         )
     }
 

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

@@ -6,14 +6,13 @@
 package org.microg.vending.billing
 
 import android.accounts.Account
-import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_CANCEL_CURRENT
-import android.app.PendingIntent.FLAG_IMMUTABLE
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import androidx.annotation.RequiresApi
+import androidx.core.app.PendingIntentCompat
 import androidx.core.os.bundleOf
 import com.android.billingclient.api.BillingClient.BillingResponseCode
 import com.android.billingclient.api.BillingClient.ProductType
@@ -350,7 +349,7 @@ class InAppBillingServiceImpl(private val context: Context) : IInAppBillingServi
             BuyFlowCacheEntry(packageName, account, buyFlowParams = params)
         val intent = Intent(context, InAppBillingHostActivity::class.java)
         intent.putExtra(KEY_IAP_SHEET_UI_PARAM, cacheEntryKey)
-        val buyFlowPendingIntent = PendingIntent.getActivity(context, requestCode, intent, FLAG_CANCEL_CURRENT or FLAG_IMMUTABLE)
+        val buyFlowPendingIntent = PendingIntentCompat.getActivity(context, requestCode, intent, FLAG_CANCEL_CURRENT, false)
         return resultBundle(BillingResponseCode.OK, "", bundleOf("BUY_INTENT" to buyFlowPendingIntent))
     }
 

vending-app/src/main/kotlin/com/android/vending/installer/Install.kt

@@ -16,6 +16,7 @@ import android.content.pm.PackageManager
 import android.os.Build
 import android.util.Log
 import androidx.annotation.RequiresApi
+import androidx.core.app.PendingIntentCompat
 import androidx.core.content.pm.PackageInfoCompat
 import com.google.android.finsky.splitinstallservice.PackageComponent
 import kotlinx.coroutines.CompletableDeferred
@@ -191,10 +192,10 @@ private suspend fun Context.installPackagesInternal(
         val intent = Intent(this, SessionResultReceiver::class.java)
         intent.putExtra(SessionResultReceiver.KEY_NOTIFY_ID, notifyId)
         intent.putExtra(SessionResultReceiver.KEY_PACKAGE_NAME, packageName)
-        val pendingIntent = PendingIntent.getBroadcast(
+        val pendingIntent = PendingIntentCompat.getBroadcast(
                 this, sessionId, intent,
-                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
-        )
+                PendingIntent.FLAG_UPDATE_CURRENT, true
+        )!!
 
         emitProgress(notifyId, CommitingSession)
         session.commit(pendingIntent.intentSender)

vending-app/src/main/kotlin/com/android/vending/installer/SessionResultReceiver.kt

@@ -15,6 +15,7 @@ import android.os.Build
 import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.PendingIntentCompat
 import androidx.core.content.ContextCompat
 import org.microg.vending.ui.notifyInstallPrompt
 
@@ -84,9 +85,9 @@ internal class SessionResultReceiver : BroadcastReceiver() {
                 val notificationManager = NotificationManagerCompat.from(context)
                 notificationManager.cancel(notifyId)
             }
-            val pendingIntent = PendingIntent.getBroadcast(
+            val pendingIntent = PendingIntentCompat.getBroadcast(
                     context, sessionId, intent,
-                    PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
+                    PendingIntent.FLAG_UPDATE_CURRENT, true
             )
             val packageName = intent.getStringExtra(KEY_PACKAGE_NAME)
             Log.d(TAG, "handleKeyguardLocked: $packageName notifyId:$notifyId")
@@ -105,13 +106,13 @@ internal class SessionResultReceiver : BroadcastReceiver() {
             }
         }
 
-        val pendingInstallIntent = PendingIntent.getBroadcast(
+        val pendingInstallIntent = PendingIntentCompat.getBroadcast(
                 context.applicationContext,
                 0,
                 installIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+                PendingIntent.FLAG_UPDATE_CURRENT, false
         )
-        return pendingInstallIntent
+        return pendingInstallIntent!!
     }
 
     data class OnResult(

vending-app/src/main/kotlin/com/android/vending/installer/Uninstall.kt

@@ -10,6 +10,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageInstaller
 import androidx.annotation.RequiresApi
+import androidx.core.app.PendingIntentCompat
 import kotlinx.coroutines.CompletableDeferred
 
 @RequiresApi(android.os.Build.VERSION_CODES.LOLLIPOP)
@@ -26,15 +27,15 @@ suspend fun Context.uninstallPackage(packageName: String) {
     )
 
     installer.uninstall(
-        packageName, PendingIntent.getBroadcast(
+        packageName, PendingIntentCompat.getBroadcast(
             this, session, Intent(this, SessionResultReceiver::class.java).apply {
                 // for an unknown reason, the session ID is not added to the response automatically :(
                 putExtra(PackageInstaller.EXTRA_SESSION_ID, session)
             },
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
-        ).intentSender
+            PendingIntent.FLAG_UPDATE_CURRENT, true
+        )!!.intentSender
     )
 
     deferred.await()
 
-}
+}