PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Consider res package when updating security icons."

Browse Source
This commit is contained in:
Shahriyar Amini
2017-01-20 01:01:14 +00:00
committed by Android (Google) Code Review
parent edfeaace61 31357bb9a8
commit ce74c1e18f
2 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
View File

@@ -25,6 +25,7 @@ import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.util.Pair;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
@@ -77,9 +78,9 @@ public class SecurityFeatureProviderImplTest {
@Implements(com.android.settingslib.drawer.TileUtils.class)
public static class TileUtilsMock {
@Implementation
public static int getIconFromUri(Context context, String uriString,
public static Pair getIconFromUri(Context context, String packageName, String uriString,
Map<String, IContentProvider> providerMap) {
return 161803;
return Pair.create("package", 161803);
}
@Implementation