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

Commit fcdcd2f4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 793e03f6 64e839a9

AndroidManifest.xml

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

+2 −4
Original line number Diff line number Diff line
@@ -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 @@ 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, FLAG_IMMUTABLE));

                .setContentIntent(PendingIntent.getActivity(this, 0, intent, 0));

        return builder.build();

    }
@@ -212,7 +210,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, FLAG_IMMUTABLE));

                .setContentIntent(PendingIntent.getActivity(this, 0, intent, 0));

        return builder.build();

    }