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

Send context object to FeatureFlagUtils.

Browse Source 
Bug: 36222960
Test: robotests
Change-Id: I9ca2d8c679474e545988f518eaf32acf459abd2c
This commit is contained in:
Fan Zhang
2017-11-13 17:37:53 -08:00
parent 4f74ed2d07
commit 06b0d5b564
19 changed files with 61 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java
View File

@@ -51,7 +51,7 @@ public class DeviceModelPreferenceController extends AbstractPreferenceControlle
super.displayPreference(screen);
final Preference pref = screen.findPreference(KEY_DEVICE_MODEL);
if (pref != null) {
if (FeatureFlagUtils.isEnabled(FeatureFlags.DEVICE_INFO_V2)) {
if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.DEVICE_INFO_V2)) {
pref.setSummary(mContext.getResources().getString(R.string.model_summary,
getDeviceModel()));
} else {