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

Commit f2d36f56 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Fix notification colors on theme change." into sc-dev am: 7003e6d3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13890165

Change-Id: Ibd2b2726019da1282f8c12c1638e6c347e48c843
parents 568cee73 7003e6d3

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java

+18 −0
Original line number Diff line number Diff line
@@ -27,8 +27,10 @@ import android.app.Notification; 
import android.content.Context;

import android.content.ContextWrapper;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.os.AsyncTask;

import android.os.CancellationSignal;

import android.os.UserHandle;

import android.service.notification.StatusBarNotification;

import android.util.Log;

import android.view.View;
@@ -768,10 +770,26 @@ public class NotificationContentInflater implements NotificationRowContentBinder 
            return mReInflateFlags;

        }



        void updateApplicationInfo(StatusBarNotification sbn) {

            String packageName = sbn.getPackageName();

            int userId = UserHandle.getUserId(sbn.getUid());

            final ApplicationInfo appInfo;

            try {

                // This method has an internal cache, so we don't need to add our own caching here.

                appInfo = mContext.getPackageManager().getApplicationInfoAsUser(packageName,

                        PackageManager.MATCH_UNINSTALLED_PACKAGES, userId);

            } catch (PackageManager.NameNotFoundException e) {

                return;

            }

            Notification.addFieldsFromContext(appInfo, sbn.getNotification());

        }



        @Override

        protected InflationProgress doInBackground(Void... params) {

            try {

                final StatusBarNotification sbn = mEntry.getSbn();

                // Ensure the ApplicationInfo is updated before a builder is recovered.

                updateApplicationInfo(sbn);

                final Notification.Builder recoveredBuilder

                        = Notification.Builder.recoverBuilder(mContext,

                        sbn.getNotification());