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

Support AIDL IDumpstateDevice service in verbose vendor logging

Browse Source 
IDumpstateDevice HAL switched to AIDL service in P22 devices.
This change will firstly apply to AIDL service if available and
fall back to HIDL service if not, making the feature work for
both HIDL an AIDL based devices.

Bug: 242634531
Test: make && make RunSettingsRoboTests
Change-Id: I4a2ec44092804574a60113e5be3df19b586bfa64
This commit is contained in:
Rambo Wang
2022-09-07 14:59:49 +00:00
parent 6f9bf171a9
commit 17a9fb6bec
3 changed files with 137 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
tests/robotests/src/com/android/settings/development/EnableVerboseVendorLoggingPreferenceControllerTest.java
View File

@@ -47,6 +47,8 @@ public final class EnableVerboseVendorLoggingPreferenceControllerTest {
private PreferenceScreen mPreferenceScreen;
@Mock
IDumpstateDevice mIDumpstateDevice;
@Mock
android.hardware.dumpstate.IDumpstateDevice mIDumpstateDeviceAidl;
private Context mContext;
private EnableVerboseVendorLoggingPreferenceController mController;
@@ -57,6 +59,7 @@ public final class EnableVerboseVendorLoggingPreferenceControllerTest {
mContext = RuntimeEnvironment.application;
mController = spy(new EnableVerboseVendorLoggingPreferenceController(mContext));
doReturn(mIDumpstateDevice).when(mController).getDumpstateDeviceService();
doReturn(mIDumpstateDeviceAidl).when(mController).getDumpstateDeviceAidlService();
// mock with Dumpstate HAL v1.1
Field f = EnableVerboseVendorLoggingPreferenceController.class
@@ -70,7 +73,9 @@ public final class EnableVerboseVendorLoggingPreferenceControllerTest {
}
@Test
public void onPreferenceChange_settingEnable_enableVendorLoggingShouldBeOn() throws Exception {
public void onPreferenceChange_settingEnableByHidl_enableVendorLoggingShouldBeOn()
throws Exception {
doReturn(null).when(mController).getDumpstateDeviceAidlService();
doReturn(true).when(mIDumpstateDevice).getVerboseLoggingEnabled();
mController.onPreferenceChange(mPreference, true /* new value */);
@@ -80,8 +85,21 @@ public final class EnableVerboseVendorLoggingPreferenceControllerTest {
}
@Test
public void onPreferenceChange_settingDisable_enableVendorLoggingShouldBeOff()
public void onPreferenceChange_settingEnableByAidl_enableVendorLoggingShouldBeOn()
throws Exception {
doReturn(mIDumpstateDeviceAidl).when(mController).getDumpstateDeviceAidlService();
doReturn(true).when(mIDumpstateDeviceAidl).getVerboseLoggingEnabled();
mController.onPreferenceChange(mPreference, true /* new value */);
final boolean enabled = mController.getVerboseLoggingEnabled();
assertTrue(enabled);
}
@Test
public void onPreferenceChange_settingDisableByHidl_enableVendorLoggingShouldBeOff()
throws Exception {
doReturn(null).when(mController).getDumpstateDeviceAidlService();
doReturn(false).when(mIDumpstateDevice).getVerboseLoggingEnabled();
mController.onPreferenceChange(mPreference, false /* new value */);
@@ -91,7 +109,20 @@ public final class EnableVerboseVendorLoggingPreferenceControllerTest {
}
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() throws Exception {
public void onPreferenceChange_settingDisableByAidl_enableVendorLoggingShouldBeOff()
throws Exception {
doReturn(mIDumpstateDeviceAidl).when(mController).getDumpstateDeviceAidlService();
doReturn(false).when(mIDumpstateDeviceAidl).getVerboseLoggingEnabled();
mController.onPreferenceChange(mPreference, false /* new value */);
final boolean enabled = mController.getVerboseLoggingEnabled();
assertFalse(enabled);
}
@Test
public void updateState_settingDisabledByHidl_preferenceShouldNotBeChecked() throws Exception {
doReturn(null).when(mController).getDumpstateDeviceAidlService();
doReturn(false).when(mIDumpstateDevice).getVerboseLoggingEnabled();
mController.setVerboseLoggingEnabled(false);
@@ -101,7 +132,19 @@ public final class EnableVerboseVendorLoggingPreferenceControllerTest {
}
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() throws Exception {
public void updateState_settingDisabledByAidl_preferenceShouldNotBeChecked() throws Exception {
doReturn(mIDumpstateDeviceAidl).when(mController).getDumpstateDeviceAidlService();
doReturn(false).when(mIDumpstateDeviceAidl).getVerboseLoggingEnabled();
mController.setVerboseLoggingEnabled(false);
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
}
@Test
public void updateState_settingEnabledByHidl_preferenceShouldBeChecked() throws Exception {
doReturn(null).when(mController).getDumpstateDeviceAidlService();
doReturn(true).when(mIDumpstateDevice).getVerboseLoggingEnabled();
mController.setVerboseLoggingEnabled(true);
@@ -111,7 +154,19 @@ public final class EnableVerboseVendorLoggingPreferenceControllerTest {
}
@Test
public void onDeveloperOptionDisabled_shouldDisablePreference() throws Exception {
public void updateState_settingEnabledByAidl_preferenceShouldBeChecked() throws Exception {
doReturn(mIDumpstateDeviceAidl).when(mController).getDumpstateDeviceAidlService();
doReturn(true).when(mIDumpstateDeviceAidl).getVerboseLoggingEnabled();
mController.setVerboseLoggingEnabled(true);
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
}
@Test
public void onDeveloperOptionDisabled_byHidl_shouldDisablePreference() throws Exception {
doReturn(null).when(mController).getDumpstateDeviceAidlService();
doReturn(false).when(mIDumpstateDevice).getVerboseLoggingEnabled();
mController.onDeveloperOptionsSwitchDisabled();
@@ -121,4 +176,17 @@ public final class EnableVerboseVendorLoggingPreferenceControllerTest {
verify(mPreference).setChecked(false);
verify(mPreference).setEnabled(false);
}
@Test
public void onDeveloperOptionDisabled_byAidl_shouldDisablePreference() throws Exception {
doReturn(mIDumpstateDeviceAidl).when(mController).getDumpstateDeviceAidlService();
doReturn(false).when(mIDumpstateDeviceAidl).getVerboseLoggingEnabled();
mController.onDeveloperOptionsSwitchDisabled();
final boolean enabled = mController.getVerboseLoggingEnabled();
assertFalse(enabled);
verify(mPreference).setChecked(false);
verify(mPreference).setEnabled(false);
}
}