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

Merge "Get input-port-associations config files from ODM partition"

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-12 23:30:58 +00:00
committed by Gerrit Code Review
parent 63d6c51c0e e84123b1c2
commit caeb150e54
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/input/InputManagerService.java
View File

@@ -3105,12 +3105,17 @@ public class InputManagerService extends IInputManager.Stub
} }
/** /**
* Ports are highly platform-specific, so only allow these to be specified in the vendor * Ports are highly platform-specific, so allow these to be specified in the odm/vendor
* directory. * directory.
*/ */
private static Map<String, Integer> loadStaticInputPortAssociations() { private static Map<String, Integer> loadStaticInputPortAssociations() {
final File baseDir = Environment.getVendorDirectory(); File baseDir = Environment.getOdmDirectory();
final File confFile = new File(baseDir, PORT_ASSOCIATIONS_PATH); File confFile = new File(baseDir, PORT_ASSOCIATIONS_PATH);
if (!confFile.exists()) {
baseDir = Environment.getVendorDirectory();
confFile = new File(baseDir, PORT_ASSOCIATIONS_PATH);
}
try (final InputStream stream = new FileInputStream(confFile)) { try (final InputStream stream = new FileInputStream(confFile)) {
return ConfigurationProcessor.processInputPortAssociations(stream); return ConfigurationProcessor.processInputPortAssociations(stream);