Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36bb3061 authored by John Shao's avatar John Shao
Browse files

Bump aosp contacts to target SDK 31 

Add mutability to pending intents

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

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

+4 −2
Original line number Diff line number Diff line
@@ -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 @@ public class SimImportService extends Service { 
                .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 @@ public class SimImportService extends Service { 
                .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();

    }