commit 36bb30611ffd07e386ef7c2cb2842d90170b6db0
author John Shao <johnshao@google.com> Fri Sep 03 17:42:44 2021 +0000
committer John Shao <johnshao@google.com> Fri Sep 03 17:56:13 2021 +0000
tree e944c0d5a8b7ae3e19ddfb3b430d280473b8f335
parent 7bc7825ab4a90c0b601794e0cfc2f77525873066

Bump aosp contacts to target SDK 31

Add mutability to pending intents

Test: Build and install on S device
Fixes: 198787169
Change-Id: I9196c30ea68075b2ca641f361799a6e9f80659d6

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 32d6644..b4b15b0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -21,7 +21,7 @@
 
     <uses-sdk
         android:minSdkVersion="21"
-        android:targetSdkVersion="30"/>
+        android:targetSdkVersion="31"/>
 
     <original-package android:name="com.android.contacts"/>
 

src/com/android/contacts/SimImportService.java

diff --git a/src/com/android/contacts/SimImportService.java b/src/com/android/contacts/SimImportService.java
index 4c74731..f6703fc 100644
--- a/src/com/android/contacts/SimImportService.java
+++ b/src/com/android/contacts/SimImportService.java
@@ -15,6 +15,8 @@
  */
 package com.android.contacts;
 
+import static android.app.PendingIntent.FLAG_IMMUTABLE;
+
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -196,7 +198,7 @@
                 .setContentTitle(this.getString(R.string.importing_sim_finished_title))
                 .setColor(this.getResources().getColor(R.color.dialtacts_theme_color))
                 .setSmallIcon(R.drawable.quantum_ic_done_vd_theme_24)
-                .setContentIntent(PendingIntent.getActivity(this, 0, intent, 0));
+                .setContentIntent(PendingIntent.getActivity(this, 0, intent, FLAG_IMMUTABLE));
         return builder.build();
     }
 
@@ -210,7 +212,7 @@
                 .setContentText(this.getString(R.string.importing_sim_failed_message))
                 .setColor(this.getResources().getColor(R.color.dialtacts_theme_color))
                 .setSmallIcon(R.drawable.quantum_ic_error_vd_theme_24)
-                .setContentIntent(PendingIntent.getActivity(this, 0, intent, 0));
+                .setContentIntent(PendingIntent.getActivity(this, 0, intent, FLAG_IMMUTABLE));
         return builder.build();
     }