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

Merge "Fix a typo in AndroidManifest.xml" into pi-dev am: 3a9fbac582

Browse Source 
am: e50f5effa0

Change-Id: I68689c03344b1987b905b32f95f91d82b5a9e129
This commit is contained in:
Fan Zhang
2018-05-10 11:32:23 -07:00
committed by android-build-merger
parent 88c10e9169 e50f5effa0
commit 4979f434fc
5 changed files with 82 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
View File

@@ -18,16 +18,12 @@
package com.android.settings.slices;
import static android.content.ContentResolver.SCHEME_CONTENT;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.app.slice.SliceManager;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
@@ -44,13 +40,13 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import androidx.slice.Slice;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import androidx.slice.Slice;
/**
* TODO Investigate using ShadowContentResolver.registerProviderInternal(String, ContentProvider)
*/