summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/current.xml11
-rw-r--r--core/java/android/app/Activity.java2
2 files changed, 12 insertions, 1 deletions
diff --git a/api/current.xml b/api/current.xml
index b2ad7d24ba71..09169ba19419 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -22143,6 +22143,17 @@
visibility="protected"
>
</field>
+<field name="POP_BACK_STACK_INCLUSIVE"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="RESULT_CANCELED"
type="int"
transient="false"
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 61fd5f3690a3..142c32580c5f 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -2059,7 +2059,7 @@ public class Activity extends ContextThemeWrapper
* removed. Otherwise, all entries up to but not including that entry
* will be removed
*/
- static final int POP_BACK_STACK_INCLUSIVE = 1<<0;
+ public static final int POP_BACK_STACK_INCLUSIVE = 1<<0;
/**
* Pop the top state off the back stack. Returns true if there was one