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

Commit 15f8d072 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update min and target SDK of Contacts to 31" am: 3e5de5b6 am: b8b9606c am: d26585bf

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

Change-Id: I7a5530fec15ddcd944aad659c277e41ea85a7261
parents 85aad5dd d26585bf
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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"/>

+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();
    }