commit 373ee455007e5f91a455562554660b73787395fa
author Christopher Dombroski <cdombroski@google.com> Fri Mar 08 10:33:34 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Mar 08 10:33:34 2019 -0800
tree 0270346e89881db05b7b681e05aa61c59ad3121e
parent 932f41940ccbe219669b0d3b78b035ee9aaae884
parent 6351187daf2035847c4aeb28bb731548d282cb63

Merge changes from topic "am-10d7afb6-3af4-4441-ba2b-ee79a6b00d71" into oc-dev
am: 6351187daf

Change-Id: I5cc99da95e8956d84c0c2ea10f228609510eaf73

apps/OomCatcher/src/com/android/cts/oomcatcher/OomCatcher.java

diff --git a/apps/OomCatcher/src/com/android/cts/oomcatcher/OomCatcher.java b/apps/OomCatcher/src/com/android/cts/oomcatcher/OomCatcher.java
index 32590b4..b7cd6c7 100644
--- a/apps/OomCatcher/src/com/android/cts/oomcatcher/OomCatcher.java
+++ b/apps/OomCatcher/src/com/android/cts/oomcatcher/OomCatcher.java
@@ -55,6 +55,7 @@
     }
 
     public void onDestroy() {
+        super.onDestroy();
         if (logThread != null) {
             logThread.interrupt();
         }
@@ -71,24 +72,27 @@
     public void onTrimMemory(int level) {
         Log.i(LOG_TAG, "Memory trim level: " + level);
         switch (level) {
-            // background messages
-            case TRIM_MEMORY_MODERATE:
-            case TRIM_MEMORY_COMPLETE:
-            // foreground messages
-            case TRIM_MEMORY_RUNNING_LOW:
-            case TRIM_MEMORY_RUNNING_CRITICAL:
+            // low priority messages being ignored
+            case TRIM_MEMORY_BACKGROUND: // bg
+            case TRIM_MEMORY_RUNNING_MODERATE: // fg
+                // fallthrough
+                Log.i(LOG_TAG, "ignoring low priority oom messages.");
+                break;
+            // medium priority messages being ignored
+            case TRIM_MEMORY_MODERATE: // bg
+            case TRIM_MEMORY_RUNNING_LOW: // fg
+                // fallthrough
+                Log.i(LOG_TAG, "ignoring medium priority oom messages.");
+                break;
+            // high priority messages
+            case TRIM_MEMORY_COMPLETE: // bg
+            case TRIM_MEMORY_RUNNING_CRITICAL: // fg
                 // fallthrough
                 onLowMemory();
                 break;
             case TRIM_MEMORY_UI_HIDDEN:
                 Log.i(LOG_TAG, "UI is hidden because the app is in the background.");
                 break;
-            // lower priority messages being ignored
-            case TRIM_MEMORY_BACKGROUND:
-            case TRIM_MEMORY_RUNNING_MODERATE:
-                // fallthrough
-                Log.i(LOG_TAG, "ignoring low priority oom messages.");
-                break;
             default:
                 Log.i(LOG_TAG, "unknown memory trim message.");
                 return;