diff options
| author | 2023-03-29 21:54:09 +0000 | |
|---|---|---|
| committer | 2023-03-29 21:54:09 +0000 | |
| commit | d5678fa6dfb87b096b4dd34625ad2e8fe9efa8d0 (patch) | |
| tree | a02111ef605741268b7d72194bac9648fb8631d2 | |
| parent | 6c1c17a1848c1cb915fdbf5bcef6bcc20d144295 (diff) | |
| parent | cc466ad44fd2783142eac05cf3df03edc40da751 (diff) | |
Merge "Remove unused constant." into udc-dev
| -rw-r--r-- | core/api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index ed36f1c3d99d..cc2e25356012 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -150,7 +150,6 @@ package android.app { method @RequiresPermission(android.Manifest.permission.DUMP) public void waitForBroadcastIdle(); field public static final long LOCK_DOWN_CLOSE_SYSTEM_DIALOGS = 174664365L; // 0xa692aadL field public static final int PROCESS_CAPABILITY_ALL_IMPLICIT = 6; // 0x6 - field @Deprecated public static final int PROCESS_CAPABILITY_NETWORK = 8; // 0x8 field public static final int PROCESS_CAPABILITY_POWER_RESTRICTED_NETWORK = 8; // 0x8 field public static final int PROCESS_STATE_FOREGROUND_SERVICE = 4; // 0x4 field public static final int PROCESS_STATE_TOP = 2; // 0x2 diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 21097079540d..c3970b4ac204 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -915,14 +915,6 @@ public class ActivityManager { /** @hide Process can access network despite any power saving restrictions */ @TestApi public static final int PROCESS_CAPABILITY_POWER_RESTRICTED_NETWORK = 1 << 3; - /** - * @hide - * @deprecated Use {@link #PROCESS_CAPABILITY_POWER_RESTRICTED_NETWORK} instead. - */ - @TestApi - @Deprecated - public static final int PROCESS_CAPABILITY_NETWORK = - PROCESS_CAPABILITY_POWER_RESTRICTED_NETWORK; /** * Flag used to indicate whether an app is allowed to start a foreground service from the |