Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CEC Configuration] Move master configuration from '/product/etc' to '/etc'

Browse Source 
Master configuration should actually be available for all ATV devices.

Bug: 168020131
Test: atest HdmiCecConfig; also flashed and smoke tested a device
Change-Id: If40b7a01e75895a3395888ef905c7e8803f77a7f
This commit is contained in:
Michal Olech
2020-10-28 12:20:50 +01:00
parent 805dcb4435
commit c80911b580
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/core/java/com/android/server/hdmi/HdmiCecConfig.java
View File

@@ -81,7 +81,7 @@ public class HdmiCecConfig {
@NonNull private final Context mContext;
@NonNull private final StorageAdapter mStorageAdapter;
@Nullable private final CecSettings mProductConfig;
@Nullable private final CecSettings mSystemConfig;
@Nullable private final CecSettings mVendorOverride;
/**
@@ -129,14 +129,14 @@ public class HdmiCecConfig {
@VisibleForTesting
HdmiCecConfig(@NonNull Context context,
@NonNull StorageAdapter storageAdapter,
@Nullable CecSettings productConfig,
@Nullable CecSettings systemConfig,
@Nullable CecSettings vendorOverride) {
mContext = context;
mStorageAdapter = storageAdapter;
mProductConfig = productConfig;
mSystemConfig = systemConfig;
mVendorOverride = vendorOverride;
if (mProductConfig == null) {
Slog.i(TAG, "CEC master configuration XML missing.");
if (mSystemConfig == null) {
Slog.i(TAG, "CEC system configuration XML missing.");
}
if (mVendorOverride == null) {
Slog.i(TAG, "CEC OEM configuration override XML missing.");
@@ -145,7 +145,7 @@ public class HdmiCecConfig {
HdmiCecConfig(@NonNull Context context) {
this(context, new StorageAdapter(),
readSettingsFromFile(Environment.buildPath(Environment.getProductDirectory(),
readSettingsFromFile(Environment.buildPath(Environment.getRootDirectory(),
ETC_DIR, CONFIG_FILE)),
readSettingsFromFile(Environment.buildPath(Environment.getVendorDirectory(),
ETC_DIR, CONFIG_FILE)));
@@ -170,7 +170,7 @@ public class HdmiCecConfig {
@Nullable
private Setting getSetting(@NonNull String name) {
if (mProductConfig == null) {
if (mSystemConfig == null) {
return null;
}
if (mVendorOverride != null) {
@@ -181,8 +181,8 @@ public class HdmiCecConfig {
}
}
}
// If not found, try the product config.
for (Setting setting : mProductConfig.getSetting()) {
// If not found, try the system config.
for (Setting setting : mSystemConfig.getSetting()) {
if (setting.getName().equals(name)) {
return setting;
}
@@ -254,11 +254,11 @@ public class HdmiCecConfig {
* Returns a list of all settings based on the XML metadata.
*/
public @CecSettingName List<String> getAllSettings() {
if (mProductConfig == null) {
if (mSystemConfig == null) {
return new ArrayList<String>();
}
List<String> allSettings = new ArrayList<String>();
for (Setting setting : mProductConfig.getSetting()) {
for (Setting setting : mSystemConfig.getSetting()) {
allSettings.add(setting.getName());
}
return allSettings;
@@ -268,12 +268,12 @@ public class HdmiCecConfig {
* Returns a list of user-modifiable settings based on the XML metadata.
*/
public @CecSettingName List<String> getUserSettings() {
if (mProductConfig == null) {
if (mSystemConfig == null) {
return new ArrayList<String>();
}
Set<String> userSettings = new HashSet<String>();
// First read from the product config.
for (Setting setting : mProductConfig.getSetting()) {
// First read from the system config.
for (Setting setting : mSystemConfig.getSetting()) {
if (setting.getUserConfigurable()) {
userSettings.add(setting.getName());
}