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

Merge "Enable excluded-input-devices settings for vendor"

Browse Source
This commit is contained in:
Treehugger Robot
2018-09-24 05:43:27 +00:00
committed by Gerrit Code Review
parent 0af2cf259b ea12b55489
commit 41a6efb488
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1879,7 +1879,12 @@ public class InputManagerService extends IInputManager.Stub
// Read partner-provided list of excluded input devices // Read partner-provided list of excluded input devices
XmlPullParser parser = null; XmlPullParser parser = null;
// Environment.getRootDirectory() is a fancy way of saying ANDROID_ROOT or "/system". // Environment.getRootDirectory() is a fancy way of saying ANDROID_ROOT or "/system".
File confFile = new File(Environment.getRootDirectory(), EXCLUDED_DEVICES_PATH); final File[] baseDirs = {
Environment.getRootDirectory(),
Environment.getVendorDirectory()
};
for (File baseDir: baseDirs) {
File confFile = new File(baseDir, EXCLUDED_DEVICES_PATH);
FileReader confreader = null; FileReader confreader = null;
try { try {
confreader = new FileReader(confFile); confreader = new FileReader(confFile);
@@ -1904,6 +1909,7 @@ public class InputManagerService extends IInputManager.Stub
} finally { } finally {
try { if (confreader != null) confreader.close(); } catch (IOException e) { } try { if (confreader != null) confreader.close(); } catch (IOException e) { }
} }
}
return names.toArray(new String[names.size()]); return names.toArray(new String[names.size()]);
} }