commit a40779d5a23c59e65055e16fb8cc01375f55ed92
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 09 06:34:13 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 09 06:34:13 2022 +0000
tree 06a0ff1bee7db27e714a01bacf3b55cd0a51ba93
parent d340a64d4f1fe63db28c463cd2f8112bb30367b5
parent 49808fec171e270e11a7f4f8077532f4b44455c8

Merge "No longer export CallSubjectDialog" into sc-dev am: 3c9c9f1aca am: 49808fec17

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/17008939

Change-Id: I907dec99040529ed081e025c52a7ca88fe95302b

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7662a2e..4c29039 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();
     }