From c44a6e08e2e60672f83e50a7d6948bce1199f055 Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Sat, 27 Aug 2016 12:16:44 +0100 Subject: [PATCH] Track getxattr API change Bug: 30992227 Change-Id: I788b3e51a536c7df7896f622038fe762f9848a2a --- services/core/java/com/android/server/pm/SELinuxMMAC.java | 5 ++--- .../core/java/com/android/server/pm/UserManagerService.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/pm/SELinuxMMAC.java b/services/core/java/com/android/server/pm/SELinuxMMAC.java index a6350fe8cf35a..5c46ca0638122 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 final class SELinuxMMAC { */ 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 d8a1c779f77e8..4faa506936a8d 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 @@ public class UserManagerService extends IUserManager.Stub { */ 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) {