summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorNandana Dutt <nandana@google.com>2019-01-28 19:40:54 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-28 19:40:54 -0800
commitf1c0ec00a3120b2026c5ed30a3670ea1baf944d6 (patch)
tree5a5951ea3b03968582677ffb26fff916ad23a0f0 /core/java/android
parent6581b4116becc2e42b8d2fd1997f17e7c714beb8 (diff)
parent6ac57c669a067a9640417b7fc46c635a72ca0075 (diff)
Merge "Expose bugreporting API as system API."
am: 6ac57c669a Change-Id: I98b7d492e8b800670a3127224d152b8fe75e758f
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/BugreportManager.java4
-rw-r--r--core/java/android/os/BugreportParams.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/os/BugreportManager.java b/core/java/android/os/BugreportManager.java
index 6f5f8072f471..3a5b8a86204e 100644
--- a/core/java/android/os/BugreportManager.java
+++ b/core/java/android/os/BugreportManager.java
@@ -21,6 +21,7 @@ import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
+import android.annotation.SystemApi;
import android.annotation.SystemService;
import android.content.Context;
import android.os.IBinder.DeathRecipient;
@@ -35,8 +36,7 @@ import java.util.concurrent.Executor;
*
* @hide
*/
-// TODO: Expose API when the implementation is more complete.
-//@SystemApi
+@SystemApi
@SystemService(Context.BUGREPORT_SERVICE)
public class BugreportManager {
private final Context mContext;
diff --git a/core/java/android/os/BugreportParams.java b/core/java/android/os/BugreportParams.java
index 4e696aed1fa8..3871375cfced 100644
--- a/core/java/android/os/BugreportParams.java
+++ b/core/java/android/os/BugreportParams.java
@@ -17,6 +17,7 @@
package android.os;
import android.annotation.IntDef;
+import android.annotation.SystemApi;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -26,8 +27,7 @@ import java.lang.annotation.RetentionPolicy;
*
* @hide
*/
-// TODO: Expose API when the implementation is more complete.
-// @SystemApi
+@SystemApi
public final class BugreportParams {
private final int mMode;