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

Commit 738424be authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Change UniquePtr to std::unique_ptr" into oc-mr1-dev am: 5b1a00f4

am: d636f613

Change-Id: If127156a6ed9ed1028442304a09c9ff99603bd72
parents a6d12c02 d636f613
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -35,12 +35,11 @@
#include <fcntl.h>
#include <sys/time.h>
#include <errno.h>
#include <memory>

#include "selinux/selinux.h"
#include "selinux/android.h"

#include <UniquePtr.h>

#define DEBUG 0

using namespace android;
@@ -55,7 +54,7 @@ struct SecurityContext_Delete {
        freecon(p);
    }
};
typedef UniquePtr<char[], SecurityContext_Delete> Unique_SecurityContext;
typedef std::unique_ptr<char[], SecurityContext_Delete> Unique_SecurityContext;

class MyShellCallback : public BnShellCallback
{