summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wale Ogunwale <ogunwale@google.com> 2018-02-14 19:39:12 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-02-14 19:39:12 +0000
commit5f76688c5a8eefd16bc51569263667e7f403f242 (patch)
tree7585d5778078b208575e2a535454946794490cb9
parent2f5b9c9b03a3945945e5b4f09c696c25bcd3ddb5 (diff)
parent4357d119af6a070611c8a3b4bc5c3795eb6acc31 (diff)
Merge "Remove Activity#setDisablePreviewScreenshots from system API"
-rw-r--r--api/system-current.txt1
-rw-r--r--core/java/android/app/Activity.java1
2 files changed, 0 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 39cbe90894ee..a9c0c3a27cf8 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -229,7 +229,6 @@ package android.app {
method public boolean convertToTranslucent(android.app.Activity.TranslucentConversionListener, android.app.ActivityOptions);
method public deprecated boolean isBackgroundVisibleBehind();
method public deprecated void onBackgroundVisibleBehindChanged(boolean);
- method public void setDisablePreviewScreenshots(boolean);
}
public static abstract interface Activity.TranslucentConversionListener {
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index bcd88fee6720..3283759d81e0 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -7751,7 +7751,6 @@ public class Activity extends ContextThemeWrapper
* @param disable {@code true} to disable preview screenshots; {@code false} otherwise.
* @hide
*/
- @SystemApi
public void setDisablePreviewScreenshots(boolean disable) {
try {
ActivityManager.getService().setDisablePreviewScreenshots(mToken, disable);