Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
system_security
Commits
590a1dad
Commit
590a1dad
authored
9 years ago
by
Treehugger Robot
Committed by
Gerrit Code Review
9 years ago
Browse files
Options
Download
Plain Diff
Merge "Fix google-explicit-constructor warnings in keystore."
parents
8f8ed7f3
d7791be0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
+5
-5
keystore/auth_token_table.h
keystore/auth_token_table.h
+1
-1
keystore/blob.h
keystore/blob.h
+1
-1
keystore/key_store_service.h
keystore/key_store_service.h
+1
-1
keystore/operation.h
keystore/operation.h
+1
-1
keystore/user_state.h
keystore/user_state.h
+1
-1
No files found.
keystore/auth_token_table.h
View file @
590a1dad
...
...
@@ -41,7 +41,7 @@ time_t clock_gettime_raw();
*/
class
AuthTokenTable
{
public:
AuthTokenTable
(
size_t
max_entries
=
32
,
time_t
(
*
clock_function
)()
=
clock_gettime_raw
)
explicit
AuthTokenTable
(
size_t
max_entries
=
32
,
time_t
(
*
clock_function
)()
=
clock_gettime_raw
)
:
max_entries_
(
max_entries
),
clock_function_
(
clock_function
)
{}
enum
Error
{
...
...
This diff is collapsed.
Click to expand it.
keystore/blob.h
View file @
590a1dad
...
...
@@ -78,7 +78,7 @@ class Blob {
public:
Blob
(
const
uint8_t
*
value
,
size_t
valueLength
,
const
uint8_t
*
info
,
uint8_t
infoLength
,
BlobType
type
);
Blob
(
blob
b
);
explicit
Blob
(
blob
b
);
Blob
();
...
...
This diff is collapsed.
Click to expand it.
keystore/key_store_service.h
View file @
590a1dad
...
...
@@ -29,7 +29,7 @@ namespace android {
class
KeyStoreService
:
public
BnKeystoreService
,
public
IBinder
::
DeathRecipient
{
public:
KeyStoreService
(
KeyStore
*
keyStore
)
:
mKeyStore
(
keyStore
),
mOperationMap
(
this
)
{}
explicit
KeyStoreService
(
KeyStore
*
keyStore
)
:
mKeyStore
(
keyStore
),
mOperationMap
(
this
)
{}
void
binderDied
(
const
wp
<
IBinder
>&
who
);
...
...
This diff is collapsed.
Click to expand it.
keystore/operation.h
View file @
590a1dad
...
...
@@ -46,7 +46,7 @@ typedef std::unique_ptr<keymaster_key_characteristics_t, keymaster_key_character
*/
class
OperationMap
{
public:
OperationMap
(
IBinder
::
DeathRecipient
*
deathRecipient
);
explicit
OperationMap
(
IBinder
::
DeathRecipient
*
deathRecipient
);
sp
<
IBinder
>
addOperation
(
keymaster_operation_handle_t
handle
,
uint64_t
keyid
,
keymaster_purpose_t
purpose
,
const
keymaster2_device_t
*
dev
,
sp
<
IBinder
>
appToken
,
keymaster_key_characteristics_t
*
characteristics
,
...
...
This diff is collapsed.
Click to expand it.
keystore/user_state.h
View file @
590a1dad
...
...
@@ -29,7 +29,7 @@
class
UserState
{
public:
UserState
(
uid_t
userId
);
explicit
UserState
(
uid_t
userId
);
~
UserState
();
bool
initialize
();
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment