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

Commit 59fd8dce authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev 

am: 7fe83ab5

* commit '7fe83ab5':
  Fix spurious crashes in StatusBarIconView

Change-Id: I46404e3903f17a5e2602502b5ac6554a255e30a8
parents 51a8c19f 7fe83ab5

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java

+16 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.statusbar; 


import android.app.Notification;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.Canvas;
@@ -25,6 +26,7 @@ import android.graphics.Paint; 
import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Icon;

import android.os.Parcelable;

import android.os.UserHandle;

import android.text.TextUtils;

import android.util.AttributeSet;
@@ -325,8 +327,20 @@ public class StatusBarIconView extends AnimatedImageView { 




    public static String contentDescForNotification(Context c, Notification n) {

        String appName = "";

        try {

            Notification.Builder builder = Notification.Builder.recoverBuilder(c, n);

        String appName = builder.loadHeaderAppName();

            appName = builder.loadHeaderAppName();

        } catch (RuntimeException e) {

            Log.e(TAG, "Unable to recover builder", e);

            // Trying to get the app name from the app info instead.

            Parcelable appInfo = n.extras.getParcelable(

                    Notification.EXTRA_BUILDER_APPLICATION_INFO);

            if (appInfo instanceof ApplicationInfo) {

                appName = String.valueOf(((ApplicationInfo) appInfo).loadLabel(

                        c.getPackageManager()));

            }

        }



        CharSequence title = n.extras.getCharSequence(Notification.EXTRA_TITLE);

        CharSequence ticker = n.tickerText;