Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
platform_frameworks_base-old
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Farzin Kazemzadeh
platform_frameworks_base-old
Commits
ebc65a45
Commit
ebc65a45
authored
1 year ago
by
Eric Biggers
Browse files
Options
Downloads
Patches
Plain Diff
Fix some comments in AndroidKeyStoreMaintenance.java
Test: N/A Change-Id: I1154d866611a744a34631a9bc129419b1e9f99e6
parent
cabf940d
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
keystore/java/android/security/AndroidKeyStoreMaintenance.java
+7
-7
7 additions, 7 deletions
...ore/java/android/security/AndroidKeyStoreMaintenance.java
with
7 additions
and
7 deletions
keystore/java/android/security/AndroidKeyStoreMaintenance.java
+
7
−
7
View file @
ebc65a45
...
@@ -28,8 +28,8 @@ import android.system.keystore2.ResponseCode;
...
@@ -28,8 +28,8 @@ import android.system.keystore2.ResponseCode;
import
android.util.Log
;
import
android.util.Log
;
/**
/**
* @hide This is the client side for IKeystore
UserManager
AIDL.
* @hide This is the client side for IKeystore
Maintenance
AIDL.
* It
shall only be used by the
LockSettingsService.
* It
is used mainly by
LockSettingsService.
*/
*/
public
class
AndroidKeyStoreMaintenance
{
public
class
AndroidKeyStoreMaintenance
{
private
static
final
String
TAG
=
"AndroidKeyStoreMaintenance"
;
private
static
final
String
TAG
=
"AndroidKeyStoreMaintenance"
;
...
@@ -66,7 +66,7 @@ public class AndroidKeyStoreMaintenance {
...
@@ -66,7 +66,7 @@ public class AndroidKeyStoreMaintenance {
}
}
/**
/**
* Informs Keystore 2.0 about removing a user
git mer
* Informs Keystore 2.0 about removing a user
*
*
* @param userId - Android user id of the user being removed
* @param userId - Android user id of the user being removed
* @return 0 if successful or a {@code ResponseCode}
* @return 0 if successful or a {@code ResponseCode}
...
@@ -91,7 +91,7 @@ public class AndroidKeyStoreMaintenance {
...
@@ -91,7 +91,7 @@ public class AndroidKeyStoreMaintenance {
*
*
* @param userId - Android user id of the user
* @param userId - Android user id of the user
* @param password - a secret derived from the synthetic password provided by the
* @param password - a secret derived from the synthetic password provided by the
* LockSettingService
* LockSetting
s
Service
* @return 0 if successful or a {@code ResponseCode}
* @return 0 if successful or a {@code ResponseCode}
* @hide
* @hide
*/
*/
...
@@ -110,7 +110,7 @@ public class AndroidKeyStoreMaintenance {
...
@@ -110,7 +110,7 @@ public class AndroidKeyStoreMaintenance {
}
}
/**
/**
* Informs Keystore 2.0 that an app was uninstalled and the corresponding namspace is to
* Informs Keystore 2.0 that an app was uninstalled and the corresponding nam
e
space is to
* be cleared.
* be cleared.
*/
*/
public
static
int
clearNamespace
(
@Domain
int
domain
,
long
namespace
)
{
public
static
int
clearNamespace
(
@Domain
int
domain
,
long
namespace
)
{
...
@@ -172,10 +172,10 @@ public class AndroidKeyStoreMaintenance {
...
@@ -172,10 +172,10 @@ public class AndroidKeyStoreMaintenance {
* namespace.
* namespace.
*
*
* @return * 0 on success
* @return * 0 on success
* * KEY_NOT_FOUND if the source did not exist
s
.
* * KEY_NOT_FOUND if the source did not exist.
* * PERMISSION_DENIED if any of the required permissions was missing.
* * PERMISSION_DENIED if any of the required permissions was missing.
* * INVALID_ARGUMENT if the destination was occupied or any domain value other than
* * INVALID_ARGUMENT if the destination was occupied or any domain value other than
* the allowed on
ce were
specified.
* the allowed on
es was
specified.
* * SYSTEM_ERROR if an unexpected error occurred.
* * SYSTEM_ERROR if an unexpected error occurred.
*/
*/
public
static
int
migrateKeyNamespace
(
KeyDescriptor
source
,
KeyDescriptor
destination
)
{
public
static
int
migrateKeyNamespace
(
KeyDescriptor
source
,
KeyDescriptor
destination
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment