Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b5a0d29 authored by Yi Kong's avatar Yi Kong Committed by android-build-merger
Browse files

Merge "Track getxattr API change" am: c4c4a1e7 

am: f897e1c3

Change-Id: I47ac9cfbd5a38849dad542089cb3fa923a8cd3fe
parents 007c463e f897e1c3

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

+2 −3
Original line number Diff line number Diff line
@@ -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) {

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

+2 −3
Original line number Diff line number Diff line
@@ -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) {