commit 032411790b74650186835a96ac70e687985c035a
author David Anderson <dvander@google.com> Wed Aug 15 09:59:14 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 15 09:59:14 2018 -0700
tree 37f45d155732cc425fc62f822b56c703ec067b20
parent a79d8384f1199e5acf706121e712e24d89c957d3
parent 1e6a318b7a11f06057bbc6b66a835305506d2c5a

Merge "fastbootd: Complete the implementation of getvar has-slot."
am: 1e6a318b7a

Change-Id: Ic8ab6c22fcd403a8cf0f99e9e262bbf2f4934b89

lmkd/lmkd.c

diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index 02534f2..b3aa59d 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -797,31 +797,24 @@
 }
 
 static int memory_stat_parse(struct memory_stat *mem_st,  int pid, uid_t uid) {
-    FILE *fp;
-    char buf[PATH_MAX];
+   FILE *fp;
+   char buf[PATH_MAX];
 
-    /*
-     * Per-application memory.stat files are available only when
-     * per-application memcgs are enabled.
-     */
-    if (!per_app_memcg)
-        return -1;
+   snprintf(buf, sizeof(buf), MEMCG_PROCESS_MEMORY_STAT_PATH, uid, pid);
 
-    snprintf(buf, sizeof(buf), MEMCG_PROCESS_MEMORY_STAT_PATH, uid, pid);
+   fp = fopen(buf, "r");
 
-    fp = fopen(buf, "r");
+   if (fp == NULL) {
+       ALOGE("%s open failed: %s", buf, strerror(errno));
+       return -1;
+   }
 
-    if (fp == NULL) {
-        ALOGE("%s open failed: %s", buf, strerror(errno));
-        return -1;
-    }
+   while (fgets(buf, PAGE_SIZE, fp) != NULL ) {
+       memory_stat_parse_line(buf, mem_st);
+   }
+   fclose(fp);
 
-    while (fgets(buf, PAGE_SIZE, fp) != NULL ) {
-        memory_stat_parse_line(buf, mem_st);
-    }
-    fclose(fp);
-
-    return 0;
+   return 0;
 }
 #endif