commit c4c4a1e76e4de30a43c3396d3e0b55209666346d
author Treehugger Robot <treehugger-gerrit@google.com> Mon Aug 29 07:57:29 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 29 07:57:30 2016 +0000
tree 57311e01ed9383f7943179303cd71bd2d963b965
parent e2732e5e384c0074e019db1019c5d8c9e68ec3fa
parent c44a6e08e2e60672f83e50a7d6948bce1199f055

Merge "Track getxattr API change"

services/core/java/com/android/server/pm/SELinuxMMAC.java

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) {

services/core/java/com/android/server/pm/UserManagerService.java

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) {