Merge "Revert "Intent API for background restriction settings"" into main
diff --git a/core/api/current.txt b/core/api/current.txt
index ce66a4f..51a71d2 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -37288,7 +37288,6 @@
field public static final String ACTION_APP_USAGE_SETTINGS = "android.settings.action.APP_USAGE_SETTINGS";
field @FlaggedApi("android.app.modes_api") public static final String ACTION_AUTOMATIC_ZEN_RULE_SETTINGS = "android.settings.AUTOMATIC_ZEN_RULE_SETTINGS";
field public static final String ACTION_AUTO_ROTATE_SETTINGS = "android.settings.AUTO_ROTATE_SETTINGS";
- field @FlaggedApi("android.app.app_restrictions_api") public static final String ACTION_BACKGROUND_RESTRICTIONS_SETTINGS = "android.settings.BACKGROUND_RESTRICTIONS_SETTINGS";
field public static final String ACTION_BATTERY_SAVER_SETTINGS = "android.settings.BATTERY_SAVER_SETTINGS";
field public static final String ACTION_BIOMETRIC_ENROLL = "android.settings.BIOMETRIC_ENROLL";
field public static final String ACTION_BLUETOOTH_SETTINGS = "android.settings.BLUETOOTH_SETTINGS";
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index c3b646a..3248522 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -1569,23 +1569,6 @@
"android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS";
/**
- * Activity Action: Show screen for controlling any background restrictions imposed on
- * an app. If the system returns true for
- * {@link android.app.ActivityManager#isBackgroundRestricted()}, and the app is not able to
- * satisfy user requests due to being restricted in the background, then this intent can be
- * used to request the user to unrestrict the app.
- * <p>
- * Input: The Intent's data URI must specify the application package name
- * to be shown, with the "package" scheme, such as "package:com.my.app".
- * <p>
- * Output: Nothing.
- */
- @FlaggedApi(android.app.Flags.FLAG_APP_RESTRICTIONS_API)
- @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
- public static final String ACTION_BACKGROUND_RESTRICTIONS_SETTINGS =
- "android.settings.BACKGROUND_RESTRICTIONS_SETTINGS";
-
- /**
* Activity Action: Open the advanced power usage details page of an associated app.
* <p>
* Input: Intent's data URI set with an application name, using the