diff options
| author | Bernardo Rufino <brufino@google.com> | 2021-01-05 17:44:09 +0000 |
|---|---|---|
| committer | Bernardo Rufino <brufino@google.com> | 2021-01-06 12:57:32 +0000 |
| commit | a5680abacd50ba606cf7ba889b1be34ff5cbd4a5 (patch) | |
| tree | f602c0962aef9421c6ff4a8086cad5625f65196d /core/java/android/app/ActivityManager.java | |
| parent | 3676cd9ac897cb757c30d6bac6cbd05c35a7f823 (diff) | |
Enable Intent.ACSD restrictions
Now that we have the major exemptions in place (permission,
notification trampolines for apps w/ targetSdk < S and tests).
Bug: 159105552
Test: atest CtsAppTestCases:android.app.cts.CloseSystemDialogsTest
Change-Id: I7687d9f20534087a6a1d989bcb4e471349fa6a88
Diffstat (limited to 'core/java/android/app/ActivityManager.java')
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 1227cc283743..8c62e9c4b2e8 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -32,7 +32,7 @@ import android.annotation.SystemApi; import android.annotation.SystemService; import android.annotation.TestApi; import android.compat.annotation.ChangeId; -import android.compat.annotation.Disabled; +import android.compat.annotation.EnabledSince; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; @@ -44,18 +44,13 @@ import android.content.pm.IPackageDataObserver; import android.content.pm.PackageManager; import android.content.pm.ParceledListSlice; import android.content.pm.UserInfo; -import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; -import android.graphics.ColorSpace; -import android.graphics.GraphicBuffer; import android.graphics.Matrix; import android.graphics.Point; -import android.graphics.Rect; import android.graphics.drawable.Icon; -import android.hardware.HardwareBuffer; import android.os.BatteryStats; import android.os.Binder; import android.os.Build; @@ -81,8 +76,6 @@ import android.util.Singleton; import android.util.Size; import android.util.TypedXmlPullParser; import android.util.TypedXmlSerializer; -import android.view.Surface; -import android.view.WindowInsetsController.Appearance; import com.android.internal.app.LocalePicker; import com.android.internal.app.procstats.ProcessStats; @@ -882,7 +875,6 @@ public class ActivityManager { */ @TestApi @ChangeId - @Disabled public static final long DROP_CLOSE_SYSTEM_DIALOGS = 174664120L; /** @@ -898,8 +890,7 @@ public class ActivityManager { */ @TestApi @ChangeId - @Disabled - // @EnabledSince(targetSdkVersion = VERSION_CODES.S) + @EnabledSince(targetSdkVersion = VERSION_CODES.S) public static final long LOCK_DOWN_CLOSE_SYSTEM_DIALOGS = 174664365L; /** @hide */ |