From 665fa7a8d61a1c00f40f4bac126143c2bd833162 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Wed, 17 Apr 2019 20:30:16 +0000 Subject: [PATCH] Revert "Add android.settings.ACTION_APP_BATTERY_SETTINGS to public API" This reverts commit c56847700434eb402c252b2fd9cc6eae7b1855dc. Reason for revert: API concerns. Bug: 129901520 Change-Id: I658de3933353ac93b13ce1f6f6616fd653663152 --- api/current.txt | 1 - core/java/android/provider/Settings.java | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/api/current.txt b/api/current.txt index 94ea8ce7b7e97..f78dfde30c3e8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -38846,7 +38846,6 @@ package android.provider { field public static final String ACTION_APPLICATION_DETAILS_SETTINGS = "android.settings.APPLICATION_DETAILS_SETTINGS"; field public static final String ACTION_APPLICATION_DEVELOPMENT_SETTINGS = "android.settings.APPLICATION_DEVELOPMENT_SETTINGS"; field public static final String ACTION_APPLICATION_SETTINGS = "android.settings.APPLICATION_SETTINGS"; - field public static final String ACTION_APP_BATTERY_SETTINGS = "android.settings.APP_BATTERY_SETTINGS"; field public static final String ACTION_APP_NOTIFICATION_BUBBLE_SETTINGS = "android.settings.APP_NOTIFICATION_BUBBLE_SETTINGS"; field public static final String ACTION_APP_NOTIFICATION_SETTINGS = "android.settings.APP_NOTIFICATION_SETTINGS"; field public static final String ACTION_APP_SEARCH_SETTINGS = "android.settings.APP_SEARCH_SETTINGS"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index d96d745205c0a..7a3c1c9280236 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -955,16 +955,18 @@ public final class Settings { "android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"; /** - * Activity Action: Open the battery details page of an associated app. + * Activity Action: Open the advanced power usage details page of an associated app. *

* Input: Intent's data URI set with an application name, using the * "package" schema (like "package:com.my.app") *

* Output: Nothing. + * + * @hide */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - public static final String ACTION_APP_BATTERY_SETTINGS = - "android.settings.APP_BATTERY_SETTINGS"; + public static final String ACTION_VIEW_ADVANCED_POWER_USAGE_DETAIL = + "android.settings.VIEW_ADVANCED_POWER_USAGE_DETAIL"; /** * Activity Action: Show screen for controlling background data