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

Commit 73b161dd authored by Fan Zhang's avatar Fan Zhang
Browse files

Fix a crash when opening app data usage for work profile 

The icon on app header is a clone of original app icon, which relies on
getConstantState() of the orginal drawable non-null.

Change-Id: Ice5360f5d00d99b3cfe538b167ce67fc06d5e402
Fix: 34190136
Test: make RunSettingsLibRoboTests
parent 899d76bc

packages/SettingsLib/src/com/android/settingslib/Utils.java

+1 −1
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ import android.content.Intent; 
import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.UserInfo;

import android.content.pm.Signature;

import android.content.pm.UserInfo;

import android.content.res.ColorStateList;

import android.content.res.Resources;

import android.content.res.TypedArray;

packages/SettingsLib/src/com/android/settingslib/drawable/UserIconDrawable.java

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.graphics.PorterDuffXfermode; 
import android.graphics.Rect;

import android.graphics.RectF;

import android.graphics.Shader;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;



import com.android.settingslib.R;
@@ -273,6 +274,11 @@ public class UserIconDrawable extends Drawable implements Drawable.Callback { 
        super.invalidateSelf();

    }



    @Override

    public ConstantState getConstantState() {

        return new BitmapDrawable(mBitmap).getConstantState();

    }



    /**

     * This 'bakes' the current state of this icon into a bitmap and removes/recycles the source

     * bitmap/drawable. Use this when no more changes will be made and an intrinsic size is set.

packages/SettingsLib/tests/robotests/src/com/android/settingslib/SuggestionParserTest.java

+6 −10
Original line number Diff line number Diff line
@@ -16,39 +16,35 @@ 


package com.android.settingslib;



import android.util.Log;

import android.content.Context;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.SharedPreferences;

import android.os.Bundle;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.os.Bundle;

import android.preference.PreferenceManager;



import com.android.settingslib.drawer.Tile;

import com.android.settingslib.drawer.TileUtilsTest;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



import com.android.settingslib.drawer.Tile;

import com.android.settingslib.drawer.TileUtilsTest;



import java.util.ArrayList;

import java.util.List;



import static com.google.common.truth.Truth.assertThat;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.when;



import org.robolectric.RuntimeEnvironment;



@RunWith(SettingLibRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

public class SuggestionParserTest {

packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawable/UserIconDrawableTest.java

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settingslib.drawable;



import android.graphics.Bitmap;

import android.graphics.BitmapFactory;



import com.android.settingslib.R;

import com.android.settingslib.SettingLibRobolectricTestRunner;

import com.android.settingslib.TestConfig;



import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



import static com.google.common.truth.Truth.assertThat;



@RunWith(SettingLibRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

public class UserIconDrawableTest {



    private UserIconDrawable mDrawable;



    @Test

    public void getConstantState_shouldNotBeNull() {

        final Bitmap b = BitmapFactory.decodeResource(

                RuntimeEnvironment.application.getResources(),

                R.drawable.home);

        mDrawable = new UserIconDrawable(100 /* size */).setIcon(b).bake();



        assertThat(mDrawable.getConstantState()).isNotNull();

    }

}