commit fcdcd2f480039b4daeba5bd59eb898f06b69b456
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 27 21:05:16 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 27 21:05:16 2021 +0000
tree 9afebe6976c11fedcae896baa0e1ac91cb10c204
parent 793e03f6e110107c70c21b4613b02ac0988c8df3
parent 64e839a9a0e73d132121e9eaa9a2da922621ba86

Merge "Revert "Bump aosp contacts to target SDK 31""

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b40f578..d66c88f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -21,7 +21,7 @@
 
     <uses-sdk
         android:minSdkVersion="21"
-        android:targetSdkVersion="31"/>
+        android:targetSdkVersion="30"/>
 
     <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 f6703fc..4c74731 100644
--- a/src/com/android/contacts/SimImportService.java
+++ b/src/com/android/contacts/SimImportService.java
@@ -15,8 +15,6 @@
  */
 package com.android.contacts;
 
-import static android.app.PendingIntent.FLAG_IMMUTABLE;
-
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -198,7 +196,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, FLAG_IMMUTABLE));
+                .setContentIntent(PendingIntent.getActivity(this, 0, intent, 0));
         return builder.build();
     }
 
@@ -212,7 +210,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, FLAG_IMMUTABLE));
+                .setContentIntent(PendingIntent.getActivity(this, 0, intent, 0));
         return builder.build();
     }