Remove experimental immersive mode support. DO NOT MERGE

Bug: 2949215

Change-Id: I7d998ef571ef7e149bb96261430e92150b80b77d

2 files changed, 0 insertions, 34 deletions

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index d535343..5d5e862 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -5687,35 +5687,6 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
         }
     }
 
-    public void setImmersive(IBinder token, boolean immersive) {
-        synchronized(this) {
-            int index = (token != null) ? mMainStack.indexOfTokenLocked(token) : -1;
-            if (index < 0) {
-                throw new IllegalArgumentException();
-            }
-            ActivityRecord r = (ActivityRecord)mMainStack.mHistory.get(index);
-            r.immersive = immersive;
-        }
-    }
-
-    public boolean isImmersive(IBinder token) {
-        synchronized (this) {
-            int index = (token != null) ? mMainStack.indexOfTokenLocked(token) : -1;
-            if (index < 0) {
-                throw new IllegalArgumentException();
-            }
-            ActivityRecord r = (ActivityRecord)mMainStack.mHistory.get(index);
-            return r.immersive;
-        }
-    }
-
-    public boolean isTopActivityImmersive() {
-        synchronized (this) {
-            ActivityRecord r = mMainStack.topRunningActivityLocked(null);
-            return (r != null) ? r.immersive : false;
-        }
-    }
-
     public final void enterSafeMode() {
         synchronized(this) {
             // It only makes sense to do this before the system is ready
diff --git a/services/java/com/android/server/am/ActivityRecord.java b/services/java/com/android/server/am/ActivityRecord.java
index 62be918..1687db1 100644
--- a/services/java/com/android/server/am/ActivityRecord.java
+++ b/services/java/com/android/server/am/ActivityRecord.java
@@ -103,7 +103,6 @@ class ActivityRecord extends IApplicationToken.Stub {
     boolean idle;           // has the activity gone idle?
     boolean hasBeenLaunched;// has this activity ever been launched?
     boolean frozenBeforeDestroy;// has been frozen but not yet destroyed.
-    boolean immersive;      // immersive mode (don't interrupt if possible)
 
     String stringName;      // for caching of toString().
     
@@ -160,7 +159,6 @@ class ActivityRecord extends IApplicationToken.Stub {
         pw.print(prefix); pw.print("keysPaused="); pw.print(keysPaused);
                 pw.print(" inHistory="); pw.print(inHistory);
                 pw.print(" persistent="); pw.print(persistent);
-                pw.print(" immersive="); pw.print(immersive);
                 pw.print(" launchMode="); pw.println(launchMode);
         pw.print(prefix); pw.print("fullscreen="); pw.print(fullscreen);
                 pw.print(" visible="); pw.print(visible);
@@ -287,8 +285,6 @@ class ActivityRecord extends IApplicationToken.Stub {
             } else {
                 isHomeActivity = false;
             }
-
-            immersive = (aInfo.flags & ActivityInfo.FLAG_IMMERSIVE) != 0;
         } else {
             realActivity = null;
             taskAffinity = null;
@@ -300,7 +296,6 @@ class ActivityRecord extends IApplicationToken.Stub {
             packageName = null;
             fullscreen = true;
             isHomeActivity = false;
-            immersive = false;
         }
     }