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

Commit 43347149 authored by Wang Le's avatar Wang Le Committed by android-build-merger
Browse files

Merge "Fix the issue that App crash on startForeground" into nyc-dev 

am: 0df1ca8a

* commit '0df1ca8a':
  Fix the issue that App crash on startForeground

Change-Id: Id900ecfa8cef9cd0135edd8f9ece9e0fac89ab3b
parents 00886746 0df1ca8a

services/core/java/com/android/server/am/ServiceRecord.java

+3 −3
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ final class ServiceRecord extends Binder { 
                    Notification localForegroundNoti = _foregroundNoti;

                    try {

                        if (localForegroundNoti.getSmallIcon() == null) {

                            // It is not correct for the caller to supply a notification

                            // It is not correct for the caller to not supply a notification

                            // icon, but this used to be able to slip through, so for

                            // those dirty apps we will create a notification clearly

                            // blaming the app.
@@ -458,8 +458,8 @@ final class ServiceRecord extends Binder { 
                            }

                            Context ctx = null;

                            try {

                                ctx = ams.mContext.createPackageContext(

                                        appInfo.packageName, 0);

                                ctx = ams.mContext.createPackageContextAsUser(

                                        appInfo.packageName, 0, new UserHandle(userId));



                                Notification.Builder notiBuilder = new Notification.Builder(ctx);