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

Fix the 'Google play system update' button is not actionable.

Browse Source 
If the ResolveInfo of the update intent is not null, set preference
to selectable.

Fixes: 147616097
Test: manual & robotest
Change-Id: If6086b113fc1c782b47966f7a30eddfdac195ce0
This commit is contained in:
Stanley Wang
2020-02-06 17:26:07 +08:00
parent cf4e12bbd9
commit 10ec77121c
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/xml/firmware_version.xml
View File

@@ -43,7 +43,6 @@
android:key="module_version" android:key="module_version"
android:title="@string/module_version" android:title="@string/module_version"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:selectable="false"
settings:enableCopying="true" settings:enableCopying="true"
settings:controller="com.android.settings.deviceinfo.firmwareversion.MainlineModuleVersionPreferenceController"/> settings:controller="com.android.settings.deviceinfo.firmwareversion.MainlineModuleVersionPreferenceController"/>

3
src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java
View File

@@ -86,8 +86,11 @@ public class MainlineModuleVersionPreferenceController extends BasePreferenceCon
mPackageManager.resolveActivity(MODULE_UPDATE_INTENT, 0 /* flags */); mPackageManager.resolveActivity(MODULE_UPDATE_INTENT, 0 /* flags */);
if (resolved != null) { if (resolved != null) {
preference.setIntent(MODULE_UPDATE_INTENT); preference.setIntent(MODULE_UPDATE_INTENT);
preference.setSelectable(true);
} else { } else {
Log.d(TAG, "The ResolveInfo of the update intent is null.");
preference.setIntent(null); preference.setIntent(null);
preference.setSelectable(false);
} }
} }

14
tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java
View File

@@ -110,6 +110,20 @@ public class MainlineModuleVersionPreferenceControllerTest {
assertThat(mPreference.getIntent()).isEqualTo(MODULE_UPDATE_INTENT); assertThat(mPreference.getIntent()).isEqualTo(MODULE_UPDATE_INTENT);
} }
@Test
public void updateStates_canHandleIntent_preferenceShouldBeSelectable() throws Exception {
setupModulePackage("test version 123");
when(mPackageManager.resolveActivity(MODULE_UPDATE_INTENT, 0))
.thenReturn(new ResolveInfo());
final MainlineModuleVersionPreferenceController controller =
new MainlineModuleVersionPreferenceController(mContext, "key");
controller.updateState(mPreference);
assertThat(mPreference.isSelectable()).isTrue();
}
@Test @Test
public void updateStates_cannotHandleIntent_setNullToPreference() throws Exception { public void updateStates_cannotHandleIntent_setNullToPreference() throws Exception {
setupModulePackage("test version 123"); setupModulePackage("test version 123");