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

Add the impl for the ability to query non-public Slices

Browse Source 
Apps get Settings Slices through onGetSliceDescendants(), so adding some
codes here to make us be capable returning non-public Slices. As these
SliceData come from slice_index.db, where SliceDatabaseAccessor is the
middleman for us to access those data, so adding a parameter in
getSliceUris() to determine what data should be returned.

Bug: 141088937
Test: robotests
Change-Id: I411eb1ff194b7c8915b9e7309c684046dbde29fb
This commit is contained in:
Yi-Ling Chuang
2019-11-21 14:48:14 +08:00
parent 1a359b5b22
commit d57e5a5d1a
7 changed files with 254 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,10 +18,13 @@
package com.android.settings.slices;
import static android.content.ContentResolver.SCHEME_CONTENT;
import static android.content.pm.PackageManager.PERMISSION_DENIED;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
@@ -66,12 +69,15 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import org.robolectric.annotation.Resetter;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowAccessibilityManager;
import org.robolectric.shadows.ShadowBinder;
import org.robolectric.shadows.ShadowPackageManager;
import java.util.ArrayList;
import java.util.Arrays;
@@ -110,6 +116,7 @@ public class SettingsSliceProviderTest {
private Context mContext;
private SettingsSliceProvider mProvider;
private ShadowPackageManager mPackageManager;
@Mock
private SliceManager mManager;
@@ -146,6 +153,8 @@ public class SettingsSliceProviderTest {
doReturn(mManager).when(mContext).getSystemService(SliceManager.class);
when(mManager.getPinnedSlices()).thenReturn(Collections.emptyList());
mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
}
@@ -284,7 +293,8 @@ public class SettingsSliceProviderTest {
@Test
public void getDescendantUris_invalidPath_returnsEmpty() {
final String key = "platform_key";
SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */);
SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, true /* isPublicSlice */);
final Uri uri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSlicesContract.AUTHORITY)
@@ -299,7 +309,8 @@ public class SettingsSliceProviderTest {
@Test
public void getDescendantUris_platformSlice_doesNotReturnOEMSlice() {
SliceTestUtils.insertSliceToDb(mContext, "oem_key", false /* isPlatformSlice */);
SliceTestUtils.insertSliceToDb(mContext, "oem_key", false /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, true /* isPublicSlice */);
final Uri uri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSlicesContract.AUTHORITY)
@@ -313,7 +324,8 @@ public class SettingsSliceProviderTest {
@Test
public void getDescendantUris_oemSlice_doesNotReturnPlatformSlice() {
SliceTestUtils.insertSliceToDb(mContext, "platform_key", true /* isPlatformSlice */);
SliceTestUtils.insertSliceToDb(mContext, "platform_key", true /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, true /* isPublicSlice */);
final Uri uri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
@@ -328,7 +340,8 @@ public class SettingsSliceProviderTest {
@Test
public void getDescendantUris_oemSlice_returnsOEMUriDescendant() {
final String key = "oem_key";
SliceTestUtils.insertSliceToDb(mContext, key, false /* isPlatformSlice */);
SliceTestUtils.insertSliceToDb(mContext, key, false /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, true /* isPublicSlice */);
final Uri uri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
@@ -351,7 +364,8 @@ public class SettingsSliceProviderTest {
@Test
public void getDescendantUris_oemSliceNoPath_returnsOEMUriDescendant() {
final String key = "oem_key";
SliceTestUtils.insertSliceToDb(mContext, key, false /* isPlatformSlice */);
SliceTestUtils.insertSliceToDb(mContext, key, false /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, true /* isPublicSlice */);
final Uri uri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
@@ -370,10 +384,32 @@ public class SettingsSliceProviderTest {
assertThat(descendants).containsExactlyElementsIn(expectedUris);
}
@Test
public void getDescendantUris_oemSliceNoPath_notContainPrivateUri() {
final String key = "oem_key";
SliceTestUtils.insertSliceToDb(mContext, key, false /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, false /* isPublicSlice */);
final Uri uri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.build();
final Uri expectedUri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath(key)
.build();
final Collection<Uri> descendants = mProvider.onGetSliceDescendants(uri);
assertThat(descendants).doesNotContain(expectedUri);
}
@Test
public void getDescendantUris_platformSlice_returnsPlatformUriDescendant() {
final String key = "platform_key";
SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */);
SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, true /* isPublicSlice */);
final Uri uri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSlicesContract.AUTHORITY)
@@ -396,7 +432,8 @@ public class SettingsSliceProviderTest {
@Test
public void getDescendantUris_platformSliceNoPath_returnsPlatformUriDescendant() {
final String key = "platform_key";
SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */);
SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, true /* isPublicSlice */);
final Uri uri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSlicesContract.AUTHORITY)
@@ -419,8 +456,10 @@ public class SettingsSliceProviderTest {
public void getDescendantUris_noAuthorityNorPath_returnsAllUris() {
final String platformKey = "platform_key";
final String oemKey = "oemKey";
SliceTestUtils.insertSliceToDb(mContext, platformKey, true /* isPlatformSlice */);
SliceTestUtils.insertSliceToDb(mContext, oemKey, false /* isPlatformSlice */);
SliceTestUtils.insertSliceToDb(mContext, platformKey, true /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, true /* isPublicSlice */);
SliceTestUtils.insertSliceToDb(mContext, oemKey, false /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, true /* isPublicSlice */);
final Uri uri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.build();
@@ -445,6 +484,48 @@ public class SettingsSliceProviderTest {
assertThat(descendants).containsExactlyElementsIn(expectedUris);
}
@Test
@Config(qualifiers = "mcc999")
public void getDescendantUris_privateSlicesNeeded_containsPrivateSliceUri() {
final String privateKey = "test_private";
final Uri specialUri = Uri.parse("content://com.android.settings.slices/test");
doReturn(true).when(mProvider).isPrivateSlicesNeeded(specialUri);
SliceTestUtils.insertSliceToDb(mContext, privateKey /* key */, false /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, false /* isPublicSlice */);
final Collection<Uri> expectedUris = new HashSet<>();
expectedUris.addAll(SPECIAL_CASE_OEM_URIS);
expectedUris.add(new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath(privateKey)
.build());
final Collection<Uri> descendants = mProvider.onGetSliceDescendants(specialUri);
assertThat(descendants).containsExactlyElementsIn(expectedUris);
}
@Test
@Config(qualifiers = "mcc999")
public void getDescendantUris_privateSlicesNotNeeded_notContainPrivateSliceUri() {
final Uri specialUri = Uri.parse("content://com.android.settings.slices/test");
doReturn(false).when(mProvider).isPrivateSlicesNeeded(specialUri);
SliceTestUtils.insertSliceToDb(mContext,
"test_private" /* key */, false /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, false /* isPublicSlice */);
final Uri expectedUri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath("test_private")
.build();
final Collection<Uri> descendants = mProvider.onGetSliceDescendants(specialUri);
assertThat(descendants).doesNotContain(expectedUri);
}
@Test
public void onCreatePermissionRequest_returnsSettingIntent() {
final PendingIntent pendingIntent = mProvider.onCreatePermissionRequest(
@@ -531,6 +612,56 @@ public class SettingsSliceProviderTest {
.grantSlicePermission("com.android.settings.slice_whitelist_package", uris.get(0));
}
@Test
@Config(qualifiers = "mcc999")
public void isPrivateSlicesNeeded_incorrectUri_returnFalse() {
final Uri uri = Uri.parse("content://com.android.settings.slices/test123");
assertThat(mProvider.isPrivateSlicesNeeded(uri)).isFalse();
}
@Test
public void isPrivateSlicesNeeded_noUri_returnFalse() {
final Uri uri = Uri.parse("content://com.android.settings.slices/test");
assertThat(mProvider.isPrivateSlicesNeeded(uri)).isFalse();
}
@Test
@Config(qualifiers = "mcc999")
public void isPrivateSlicesNeeded_correctUriWithPermissionAndIsSI_returnTrue() {
final Uri uri = Uri.parse("content://com.android.settings.slices/test");
ShadowBinder.setCallingUid(123);
doReturn(PERMISSION_GRANTED)
.when(mContext).checkPermission(anyString(), anyInt(), anyInt());
mPackageManager.setPackagesForUid(123, new String[]{"com.android.settings.intelligence"});
assertThat(mProvider.isPrivateSlicesNeeded(uri)).isTrue();
}
@Test
@Config(qualifiers = "mcc999")
public void isPrivateSlicesNeeded_correctUriWithPermissionNotSI_returnFalse() {
final Uri uri = Uri.parse("content://com.android.settings.slices/test");
ShadowBinder.setCallingUid(123);
doReturn(PERMISSION_GRANTED)
.when(mContext).checkPermission(anyString(), anyInt(), anyInt());
mPackageManager.setPackagesForUid(123, new String[]{"com.android.settings.test"});
assertThat(mProvider.isPrivateSlicesNeeded(uri)).isFalse();
}
@Test
@Config(qualifiers = "mcc999")
public void isPrivateSlicesNeeded_correctUriNoPermission_returnFalse() {
final Uri uri = Uri.parse("content://com.android.settings.slices/test");
ShadowBinder.setCallingUid(123);
doReturn(PERMISSION_DENIED).when(mContext).checkPermission(anyString(), anyInt(), anyInt());
mPackageManager.setPackagesForUid(123, new String[]{"com.android.settings.intelligence"});
assertThat(mProvider.isPrivateSlicesNeeded(uri)).isFalse();
}
private static SliceData getDummyData() {
return new SliceData.Builder()
.setKey(KEY)

6
tests/robotests/src/com/android/settings/slices/SliceTestUtils.java
View File

@@ -47,6 +47,11 @@ class SliceTestUtils {
public static void insertSliceToDb(Context context, String key, boolean isPlatformSlice,
String customizedUnavailableSliceSubtitle) {
insertSliceToDb(context, key, isPlatformSlice, customizedUnavailableSliceSubtitle, false);
}
public static void insertSliceToDb(Context context, String key, boolean isPlatformSlice,
String customizedUnavailableSliceSubtitle, boolean isPublicSlice) {
final SQLiteDatabase db = SlicesDatabaseHelper.getInstance(context).getWritableDatabase();
ContentValues values = new ContentValues();
values.put(SlicesDatabaseHelper.IndexColumns.KEY, key);
@@ -69,6 +74,7 @@ class SliceTestUtils {
values.put(SlicesDatabaseHelper.IndexColumns.SLICE_TYPE, SliceData.SliceType.INTENT);
values.put(SlicesDatabaseHelper.IndexColumns.UNAVAILABLE_SLICE_SUBTITLE,
customizedUnavailableSliceSubtitle);
values.put(SlicesDatabaseHelper.IndexColumns.PUBLIC_SLICE, isPublicSlice);
db.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
db.close();

65
tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
View File

@@ -17,6 +17,8 @@
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.spy;
@@ -168,8 +170,10 @@ public class SlicesDatabaseAccessorTest {
@Test
public void getDescendantUris_platformSlice_doesNotReturnOEMSlice() {
final String key = "oem_key";
SliceTestUtils.insertSliceToDb(mContext, key, false /* isPlatformSlice */);
final List<Uri> keys = mAccessor.getSliceUris(SettingsSlicesContract.AUTHORITY);
SliceTestUtils.insertSliceToDb(mContext, key, false /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, true /* isPublicSlice */);
final List<Uri> keys = mAccessor.getSliceUris(SettingsSlicesContract.AUTHORITY,
true /* isPublicSlice */);
assertThat(keys).isEmpty();
}
@@ -177,8 +181,10 @@ public class SlicesDatabaseAccessorTest {
@Test
public void getDescendantUris_oemSlice_doesNotReturnPlatformSlice() {
final String key = "platform_key";
SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */);
final List<Uri> keys = mAccessor.getSliceUris(SettingsSliceProvider.SLICE_AUTHORITY);
SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, true /* isPublicSlice */);
final List<Uri> keys = mAccessor.getSliceUris(SettingsSliceProvider.SLICE_AUTHORITY,
true /* isPublicSlice */);
assertThat(keys).isEmpty();
}
@@ -186,8 +192,10 @@ public class SlicesDatabaseAccessorTest {
@Test
public void getDescendantUris_oemSlice_returnsOEMUriDescendant() {
final String key = "oem_key";
SliceTestUtils.insertSliceToDb(mContext, key, false /* isPlatformSlice */);
final List<Uri> keys = mAccessor.getSliceUris(SettingsSliceProvider.SLICE_AUTHORITY);
SliceTestUtils.insertSliceToDb(mContext, key, false /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, true /* isPublicSlice */);
final List<Uri> keys = mAccessor.getSliceUris(SettingsSliceProvider.SLICE_AUTHORITY,
true /* isPublicSlice */);
assertThat(keys).containsExactly(
Uri.parse("content://com.android.settings.slices/action/oem_key"));
@@ -196,13 +204,51 @@ public class SlicesDatabaseAccessorTest {
@Test
public void getDescendantUris_platformSlice_returnsPlatformUriDescendant() {
final String key = "platform_key";
SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */);
final List<Uri> keys = mAccessor.getSliceUris(SettingsSlicesContract.AUTHORITY);
SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, true /* isPublicSlice */);
final List<Uri> keys = mAccessor.getSliceUris(SettingsSlicesContract.AUTHORITY,
true /* isPublicSlice */);
assertThat(keys).containsExactly(
Uri.parse("content://android.settings.slices/action/platform_key"));
}
@Test
public void getSliceUris_publicSlice_returnPublicUri() {
SliceTestUtils.insertSliceToDb(mContext, "test_public", false /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, true /* isPublicSlice */);
SliceTestUtils.insertSliceToDb(mContext, "test_private", false /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, false /* isPublicSlice */);
final Uri expectedUri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath("test_public")
.build();
final List<Uri> uri = mAccessor.getSliceUris(SettingsSliceProvider.SLICE_AUTHORITY, true);
assertThat(uri).containsExactly(expectedUri);
}
@Test
public void getSliceUris_nonPublicSlice_returnNonPublicUri() {
SliceTestUtils.insertSliceToDb(mContext, "test_public", false /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, true /* isPublicSlice */);
SliceTestUtils.insertSliceToDb(mContext, "test_private", false /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */, false /* isPublicSlice */);
final Uri expectedUri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath("test_private")
.build();
final List<Uri> uri = mAccessor.getSliceUris(SettingsSliceProvider.SLICE_AUTHORITY, false);
assertThat(uri).containsExactly(expectedUri);
}
@Test
@Config(qualifiers = "mcc999")
public void getSliceKeys_indexesDatabase() {
@@ -220,7 +266,8 @@ public class SlicesDatabaseAccessorTest {
FakeIndexProvider.SEARCH_INDEX_DATA_PROVIDER));
final SlicesDatabaseAccessor accessor = new SlicesDatabaseAccessor(mContext);
final List<Uri> keys = accessor.getSliceUris(SettingsSliceProvider.SLICE_AUTHORITY);
final List<Uri> keys = accessor.getSliceUris(SettingsSliceProvider.SLICE_AUTHORITY,
true /* isPublicSlice */);
assertThat(keys).isNotEmpty();
}