Merge "Track getxattr API change"
diff --git a/services/core/java/com/android/server/pm/SELinuxMMAC.java b/services/core/java/com/android/server/pm/SELinuxMMAC.java
index a6350fe..5c46ca0 100644
--- a/services/core/java/com/android/server/pm/SELinuxMMAC.java
+++ b/services/core/java/com/android/server/pm/SELinuxMMAC.java
@@ -323,9 +323,8 @@
*/
public static boolean isRestoreconNeeded(File file) {
try {
- final byte[] buf = new byte[20];
- final int len = Os.getxattr(file.getAbsolutePath(), XATTR_SEAPP_HASH, buf);
- if ((len == 20) && Arrays.equals(SEAPP_CONTEXTS_HASH, buf)) {
+ final byte[] buf = Os.getxattr(file.getAbsolutePath(), XATTR_SEAPP_HASH);
+ if ((buf.length == 20) && Arrays.equals(SEAPP_CONTEXTS_HASH, buf)) {
return false;
}
} catch (ErrnoException e) {
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index d8a1c77..4faa506 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -2958,9 +2958,8 @@
*/
private static int getSerialNumber(File file) throws IOException {
try {
- final byte[] buf = new byte[256];
- final int len = Os.getxattr(file.getAbsolutePath(), XATTR_SERIAL, buf);
- final String serial = new String(buf, 0, len);
+ final byte[] buf = Os.getxattr(file.getAbsolutePath(), XATTR_SERIAL);
+ final String serial = new String(buf);
try {
return Integer.parseInt(serial);
} catch (NumberFormatException e) {