From 8620dfb52704409ff415f7a348e74d455ee13834 Mon Sep 17 00:00:00 2001
From: minaripenguin <minaripenguin@users.noreply.github.com>
Date: Thu, 12 Sep 2024 21:36:35 +0800
Subject: [PATCH] OmnijawsClient: Fix memory leak

Signed-off-by: minaripenguin <minaripenguin@users.noreply.github.com>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
Signed-off-by: Dmitrii <bankersenator@gmail.com>
Signed-off-by: MOVZX <movzx@yahoo.com>
---
 .../util/evolution/OmniJawsClient.java        | 42 ++++++++++++-------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/core/java/com/android/internal/util/evolution/OmniJawsClient.java b/core/java/com/android/internal/util/evolution/OmniJawsClient.java
index 2bbd51ffab8cf..d4625bd64373f 100644
--- a/core/java/com/android/internal/util/evolution/OmniJawsClient.java
+++ b/core/java/com/android/internal/util/evolution/OmniJawsClient.java
@@ -60,6 +60,8 @@ public class OmniJawsClient {
     public static final int EXTRA_ERROR_NETWORK = 0;
     public static final int EXTRA_ERROR_LOCATION = 1;
     public static final int EXTRA_ERROR_DISABLED = 2;
+    
+    private boolean mWeatherReceiverRegistered;
 
     public static final String[] WEATHER_PROJECTION = new String[]{
             "city",
@@ -142,8 +144,7 @@ public class OmniJawsClient {
             for (OmniJawsObserver observer : mObserver) {
                 if (action.equals(WEATHER_UPDATE)) {
                     observer.weatherUpdated();
-                }
-                if (action.equals(WEATHER_ERROR)) {
+                } else if (action.equals(WEATHER_ERROR)) {
                     int errorReason = intent.getIntExtra(EXTRA_ERROR, 0);
                     observer.weatherError(errorReason);
                 }
@@ -406,7 +407,24 @@ public class OmniJawsClient {
     }
 
     public void addObserver(OmniJawsObserver observer) {
-        if (mObserver.size() == 0) {
+        if (mObserver.contains(observer)) {
+            removeObserver(observer);
+        }
+        mObserver.add(observer);
+        registerReceiverIfNeeded();
+    }
+
+    public void removeObserver(OmniJawsObserver observer) {
+        if (mObserver.contains(observer)) {
+            mObserver.remove(observer);
+            if (mObserver.isEmpty()) {
+                unregisterReceiver();
+            }
+        }
+    }
+
+    private void registerReceiverIfNeeded() {
+        if (mObserver.size() == 1 && !mWeatherReceiverRegistered) {
             if (mReceiver != null) {
                 try {
                     mContext.unregisterReceiver(mReceiver);
@@ -419,20 +437,14 @@ public class OmniJawsClient {
             filter.addAction(WEATHER_ERROR);
             if (DEBUG) Log.d(TAG, "registerReceiver");
             mContext.registerReceiver(mReceiver, filter, Context.RECEIVER_EXPORTED);
+            mWeatherReceiverRegistered = true;
         }
-        mObserver.add(observer);
     }
-
-    public void removeObserver(OmniJawsObserver observer) {
-        mObserver.remove(observer);
-        if (mObserver.size() == 0 && mReceiver != null) {
-            try {
-                if (DEBUG) Log.d(TAG, "unregisterReceiver");
-                mContext.unregisterReceiver(mReceiver);
-            } catch (Exception e) {
-            }
-            mReceiver = null;
-        }
+    
+    private void unregisterReceiver() {
+        if (!mWeatherReceiverRegistered) return;
+        mContext.unregisterReceiver(mReceiver);
+        mWeatherReceiverRegistered = false;
     }
 
     public boolean isOutlineIconPackage() {