commit 9b09412e8a9a33df87862aaa175598ebde4980d4
author John Shao <johnshao@google.com> Wed Oct 27 22:22:46 2021 +0000
committer John Shao <johnshao@google.com> Thu Oct 28 21:10:30 2021 +0000
tree c37e53e786eeec0ed1c48f3293d94600d78b1db8
parent 965d02466796a9c600351a58cdea8ec70834ba0b

Update min and target SDK of Contacts to 31

Test: manual
Bug: 198787169
Change-Id: I63279df46ed6c0db96faf7976bfa3c8fbff5f94b
Merged-In: I63279df46ed6c0db96faf7976bfa3c8fbff5f94b

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a5b25de..1a61760 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,8 +20,8 @@
           android:versionName="1.7.33">
 
     <uses-sdk
-        android:minSdkVersion="21"
-        android:targetSdkVersion="30"/>
+        android:minSdkVersion="31"
+        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();
     }