commit 64e839a9a0e73d132121e9eaa9a2da922621ba86
author John Shao <johnshao@google.com> Tue Oct 19 22:45:32 2021 +0000
committer John Shao <johnshao@google.com> Tue Oct 19 22:45:32 2021 +0000
tree 908c4985ad479e7419ce82565f0aa53b724cb8b5
parent 36bb30611ffd07e386ef7c2cb2842d90170b6db0

Revert "Bump aosp contacts to target SDK 31"

This reverts commit 36bb30611ffd07e386ef7c2cb2842d90170b6db0.

Reason for revert: IMMUTABLE was added in SDK 23

Change-Id: I2c9487867f76cd46774d4a71900001b0895e0f78

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b4b15b0..32d6644 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();
     }