commit 08d6d728c7b874c7e7d8f9622f47dc39fa508676
author Chenjie Yu <cjyu@google.com> Wed Feb 28 10:19:54 2018 -0800
committer Chenjie Yu <cjyu@google.com> Thu Mar 01 18:03:08 2018 -0800
tree 9c44cb16f2fcca26d81b96cad2d8ba6a5db1ec8a
parent 6158952c30497fa10bed5f7955cfb25c394e7593

Avoid double logging for app overlay

Right now if an app is TYPE_APPLICATION_OVERLAY, it gets logged twice

Fix: 73952594
Test: manual test and cts test
Change-Id: Ieca79545c76f0773cb939efd236705a067bb1e6d

services/core/java/com/android/server/wm/Session.java

diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java
index 2c3c5d2..94b8518 100644
--- a/services/core/java/com/android/server/wm/Session.java
+++ b/services/core/java/com/android/server/wm/Session.java
@@ -509,14 +509,10 @@
             // on-going notification for the user to control their visibility.
             if (visible) {
                 changed = mAlertWindowSurfaces.add(surfaceController);
-                if (changed) {
-                    MetricsLoggerWrapper.logAppOverlayEnter(mUid, mPackageName, true);
-                }
+                MetricsLoggerWrapper.logAppOverlayEnter(mUid, mPackageName, changed, type, true);
             } else {
                 changed = mAlertWindowSurfaces.remove(surfaceController);
-                if (changed) {
-                    MetricsLoggerWrapper.logAppOverlayExit(mUid, mPackageName, true);
-                }
+                MetricsLoggerWrapper.logAppOverlayExit(mUid, mPackageName, changed, type, true);
             }
 
             if (changed) {
@@ -537,14 +533,10 @@
 
         if (visible) {
             changed = mAppOverlaySurfaces.add(surfaceController);
-            if (changed) {
-                MetricsLoggerWrapper.logAppOverlayEnter(mUid, mPackageName, false);
-            }
+            MetricsLoggerWrapper.logAppOverlayEnter(mUid, mPackageName, changed, type, false);
         } else {
             changed = mAppOverlaySurfaces.remove(surfaceController);
-            if (changed) {
-                MetricsLoggerWrapper.logAppOverlayExit(mUid, mPackageName, false);
-            }
+            MetricsLoggerWrapper.logAppOverlayExit(mUid, mPackageName, changed, type, false);
         }
 
         if (changed) {