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

Make some device info related slices public.

Browse Source 
Only PreferenceControllers with isPublicSlice() set to true are exposed
to other apps. Others will be Settings only.

Bug: 141088937
Test: robotests
Change-Id: Id38fd0203a4efc812e30990491786b4d8aff8902
This commit is contained in:
Yi-Ling Chuang
2019-11-27 16:55:26 +08:00
parent 617458b07c
commit 2516848b30
14 changed files with 70 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
View File

@@ -102,6 +102,11 @@ public class BuildNumberPreferenceController extends BasePreferenceController im
return true;
}
@Override
public boolean isPublicSlice() {
return true;
}
@Override
public boolean isCopyableSlice() {
return true;

5
src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
View File

@@ -95,6 +95,11 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
return true;
}
@Override
public boolean isPublicSlice() {
return true;
}
@Override
public boolean isCopyableSlice() {
return true;

5
src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java
View File

@@ -68,6 +68,11 @@ public class FirmwareVersionDetailPreferenceController extends BasePreferenceCon
return true;
}
@Override
public boolean isPublicSlice() {
return true;
}
@Override
public CharSequence getSummary() {
return Build.VERSION.RELEASE;

5
src/com/android/settings/deviceinfo/hardwareinfo/DeviceModelPreferenceController.java
View File

@@ -40,6 +40,11 @@ public class DeviceModelPreferenceController extends HardwareInfoPreferenceContr
return true;
}
@Override
public boolean isPublicSlice() {
return true;
}
@Override
public CharSequence getSummary() {
return HardwareInfoPreferenceController.getDeviceModel();

5
src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java
View File

@@ -45,6 +45,11 @@ public class HardwareRevisionPreferenceController extends BasePreferenceControll
return true;
}
@Override
public boolean isPublicSlice() {
return true;
}
@Override
public boolean isCopyableSlice() {
return true;

5
src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceController.java
View File

@@ -40,6 +40,11 @@ public class SerialNumberPreferenceController extends BasePreferenceController {
return true;
}
@Override
public boolean isPublicSlice() {
return true;
}
@Override
public boolean isCopyableSlice() {
return true;

5
src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
View File

@@ -123,6 +123,11 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {
return true;
}
@Override
public boolean isPublicSlice() {
return true;
}
@Override
public boolean isCopyableSlice() {
return true;

5
tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
View File

@@ -205,4 +205,9 @@ public class BuildNumberPreferenceControllerTest {
final CharSequence data = clipboard.getPrimaryClip().getItemAt(0).getText();
assertThat(data.toString()).isEqualTo(mController.getSummary());
}
@Test
public void isPublicSlice_returnTrue() {
assertThat(mController.isPublicSlice()).isTrue();
}
}

5
tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java
View File

@@ -179,4 +179,9 @@ public class PhoneNumberPreferenceControllerTest {
final CharSequence data = clipboard.getPrimaryClip().getItemAt(0).getText();
assertThat(phoneNumber.contentEquals(data)).isTrue();
}
@Test
public void isPublicSlice_returnTrue() {
assertThat(mController.isPublicSlice()).isTrue();
}
}

6
tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceControllerTest.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.deviceinfo.firmwareversion;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -89,6 +88,11 @@ public class FirmwareVersionDetailPreferenceControllerTest {
verify(mContext).startActivity(any());
}
@Test
public void isPublicSlice_returnTrue() {
assertThat(mController.isPublicSlice()).isTrue();
}
private static class TestController extends FirmwareVersionDetailPreferenceController {
public TestController(Context context, String key) {

5
tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/DeviceModelPreferenceControllerTest.java
View File

@@ -61,4 +61,9 @@ public class DeviceModelPreferenceControllerTest {
public void isAlwaysSliceable() {
assertThat(mController.isSliceable()).isTrue();
}
@Test
public void isPublicSlice_returnTrue() {
assertThat(mController.isPublicSlice()).isTrue();
}
}

5
tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceControllerTest.java
View File

@@ -50,6 +50,11 @@ public class HardwareRevisionPreferenceControllerTest {
assertThat(mController.isSliceable()).isTrue();
}
@Test
public void isPublicSlice_returnTrue() {
assertThat(mController.isPublicSlice()).isTrue();
}
@Test
public void isCopyableSlice_shouldBeCopyableSlice() {
assertThat(mController.isCopyableSlice()).isTrue();

5
tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceControllerTest.java
View File

@@ -42,6 +42,11 @@ public class SerialNumberPreferenceControllerTest {
mController = new SerialNumberPreferenceController(mContext, "test");
}
@Test
public void isPublicSlice_returnTrue() {
assertThat(mController.isPublicSlice()).isTrue();
}
@Test
public void isCopyableSlice() {
assertThat(mController.isSliceable()).isTrue();

5
tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java
View File

@@ -186,4 +186,9 @@ public class ImeiInfoPreferenceControllerTest {
final CharSequence data = clipboard.getPrimaryClip().getItemAt(0).getText();
assertThat(data.toString()).isEqualTo(meid);
}
@Test
public void isPublicSlice_returnTrue() {
assertThat(mController.isPublicSlice()).isTrue();
}
}