Merge "Refurbish granting mechanism" into oc-dr1-dev-plus-aosp

    byte[] sign(String name, in byte[] data);

    int verify(String name, in byte[] data, in byte[] signature);

    byte[] get_pubkey(String name);

    int grant(String name, int granteeUid);

    String grant(String name, int granteeUid);

    int ungrant(String name, int granteeUid);

    long getmtime(String name, int uid);

    int duplicate(String srcKey, int srcUid, String destKey, int destUid);

        }

    }

    public boolean grant(String key, int uid) {

    public String grant(String key, int uid) {

        try {

            return mBinder.grant(key, uid) == NO_ERROR;

            String grantAlias =  mBinder.grant(key, uid);

            if (grantAlias == "") return null;

            return grantAlias;

        } catch (RemoteException e) {

            Log.w(TAG, "Cannot connect to keystore", e);

            return false;

            return null;

        }

    }