diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2017-06-06 15:48:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-06 15:48:24 +0000 |
| commit | ec68b46bc85b2317053da7e2933876fc6e51ac2f (patch) | |
| tree | 2255e80e732a2b4ea68c50685d1dfc8a3956509f /core/java/android/app/KeyguardManager.java | |
| parent | 811e9d6ee820b84922ff6a9794a91c1ebfa958f2 (diff) | |
| parent | 7a2e4a848602ddb861f9f35cb93edbdca32a7db1 (diff) | |
Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4
am: 7a2e4a8486
Change-Id: Ib629e25dbf047c110feaf03e4ff744b5c6df9aeb
Diffstat (limited to 'core/java/android/app/KeyguardManager.java')
| -rw-r--r-- | core/java/android/app/KeyguardManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java index 4a0b644d758a..16b21f15353e 100644 --- a/core/java/android/app/KeyguardManager.java +++ b/core/java/android/app/KeyguardManager.java @@ -20,6 +20,7 @@ import android.Manifest; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; +import android.annotation.SystemService; import android.app.trust.ITrustManager; import android.content.Context; import android.content.Intent; @@ -46,12 +47,11 @@ import com.android.internal.widget.LockPatternUtils; import java.util.List; /** - * Class that can be used to lock and unlock the keyboard. Get an instance of this - * class by calling {@link android.content.Context#getSystemService(java.lang.String)} - * with argument {@link android.content.Context#KEYGUARD_SERVICE}. The + * Class that can be used to lock and unlock the keyboard. The * actual class to control the keyboard locking is * {@link android.app.KeyguardManager.KeyguardLock}. */ +@SystemService(Context.KEYGUARD_SERVICE) public class KeyguardManager { private static final String TAG = "KeyguardManager"; |