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

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

Merge changes from topic "am-b36d86f4-1165-4732-96de-e44bd366c739" into ub-launcher3-master 

* changes:
  [automerger] Try-catching getColorHints in wallpapermanager compat. am: 2b107399
  Try-catching getColorHints in wallpapermanager compat.
parents 61448461 7b6badad

src/com/android/launcher3/compat/WallpaperManagerCompatVOMR1.java

+10 −6
Original line number Diff line number Diff line
@@ -33,11 +33,15 @@ public class WallpaperManagerCompatVOMR1 extends WallpaperManagerCompat { 
    private static final String TAG = "WMCompatVOMR1";



    private final WallpaperManager mWm;

    private final Method mWCColorHintsMethod;

    private Method mWCColorHintsMethod;



    WallpaperManagerCompatVOMR1(Context context) throws Exception {

        mWm = context.getSystemService(WallpaperManager.class);

        try {

            mWCColorHintsMethod = WallpaperColors.class.getDeclaredMethod("getColorHints");

        } catch (Exception exc) {

            Log.e(TAG, "getColorHints not available", exc);

        }

    }



    @Nullable
@@ -49,12 +53,10 @@ public class WallpaperManagerCompatVOMR1 extends WallpaperManagerCompat { 
    @Override

    public void addOnColorsChangedListener(final OnColorsChangedListenerCompat listener) {

        OnColorsChangedListener onChangeListener = new OnColorsChangedListener() {

            @Override

            public void onColorsChanged(WallpaperColors colors, int which) {

                listener.onColorsChanged(convertColorsObject(colors), which);

            }

            public void onColorsChanged(WallpaperColors colors, int which, int userId) {

                onColorsChanged(colors, which);

            }

        };

        mWm.addOnColorsChangedListener(onChangeListener, null);

    }
@@ -71,7 +73,9 @@ public class WallpaperManagerCompatVOMR1 extends WallpaperManagerCompat { 
        int tertiaryVal = tertiary != null ? tertiary.toArgb() : 0;

        int colorHints = 0;

        try {

            if (mWCColorHintsMethod != null) {

                colorHints = (Integer) mWCColorHintsMethod.invoke(colors);

            }

        } catch (Exception exc) {

            Log.e(TAG, "error calling color hints", exc);

        }