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

Commit 7a5556d0 authored by Winson Chung's avatar Winson Chung Committed by Android Git Automerger
Browse files

am 5b1a0a46: Merge "Fixing crash in Activity.onApplyTheme()." 

* commit '5b1a0a46a125d1e2f4c469a964feac5321f6e933':
  Fixing crash in Activity.onApplyTheme().
parents 0b20f57c 77dd7ce5

core/java/android/app/Activity.java

+2 −3
Original line number Diff line number Diff line
@@ -3618,9 +3618,8 @@ public class Activity extends ContextThemeWrapper 
        }



        // Get the primary color and update the RecentsActivityValues for this activity

        Resources.Theme tmpTheme = getTheme();

        if (tmpTheme != null) {

            TypedArray a = tmpTheme.obtainStyledAttributes(com.android.internal.R.styleable.Theme);

        if (theme != null) {

            TypedArray a = theme.obtainStyledAttributes(com.android.internal.R.styleable.Theme);

            int colorPrimary = a.getColor(com.android.internal.R.styleable.Theme_colorPrimary, 0);

            a.recycle();

            if (colorPrimary != 0) {