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

Merge "Add feature flag check for mainline module version."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-31 00:38:07 +00:00
committed by Android (Google) Code Review
parent 6b3db61e53 f5fd5c4985
commit 1566e71c73
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/core/FeatureFlags.java
View File

@@ -28,4 +28,5 @@ public class FeatureFlags {
public static final String NETWORK_INTERNET_V2 = "settings_network_and_internet_v2";
public static final String WIFI_SHARING = "settings_wifi_sharing";
public static final String SLICE_INJECTION = "settings_slice_injection";
public static final String MAINLINE_MODULE = "settings_mainline_module";
}

7
src/com/android/settings/deviceinfo/firmwareversion/ModuleVersionDialogController.java
View File

@@ -19,9 +19,11 @@ package com.android.settings.deviceinfo.firmwareversion;
import android.content.Context;
import android.content.pm.PackageManager;
import android.text.TextUtils;
import android.util.FeatureFlagUtils;
import android.util.Log;
import com.android.settings.R;
import com.android.settings.core.FeatureFlags;
import androidx.annotation.VisibleForTesting;
@@ -48,6 +50,11 @@ public class ModuleVersionDialogController {
* Updates the mainline module version field of the dialog.
*/
public void initialize() {
if (!FeatureFlagUtils.isEnabled(mContext, FeatureFlags.MAINLINE_MODULE)) {
mDialog.removeSettingFromScreen(MODULE_VERSION_LABEL_ID);
mDialog.removeSettingFromScreen(MODULE_VERSION_VALUE_ID);
return;
}
final String moduleProvider = mContext.getString(
com.android.internal.R.string.config_defaultModuleMetadataProvider);
if (!TextUtils.isEmpty(moduleProvider)) {