Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add cleanup method to FalsingManager to prevent memory leaks." into qt-dev

Browse Source 
am: f0fb6e1b29

Change-Id: I685932b655a204abe41d69921ef16d399e873b56
This commit is contained in:
Dave Mankoff
2019-07-23 10:52:20 -07:00
committed by android-build-merger
parent 121bafc53e f0fb6e1b29
commit c1ee5ff99b
4 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/plugin/src/com/android/systemui/plugins/FalsingManager.java
View File

@@ -30,7 +30,7 @@ import java.io.PrintWriter;
*/
@ProvidesInterface(version = FalsingManager.VERSION)
public interface FalsingManager {
int VERSION = 1;
int VERSION = 2;
void onSucccessfulUnlock();
@@ -103,4 +103,6 @@ public interface FalsingManager {
void onTouchEvent(MotionEvent ev, int width, int height);
void dump(PrintWriter pw);
void cleanup();
}

9
packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerImpl.java
View File

@@ -168,6 +168,7 @@ public class FalsingManagerImpl implements FalsingManager {
.append("enabled=").append(isEnabled() ? 1 : 0)
.append(" mScreenOn=").append(mScreenOn ? 1 : 0)
.append(" mState=").append(StatusBarState.toShortString(mState))
.append(" mShowingAod=").append(mShowingAod ? 1 : 0)
.toString()
);
}
@@ -550,6 +551,14 @@ public class FalsingManagerImpl implements FalsingManager {
pw.println();
}
@Override
public void cleanup() {
mSensorManager.unregisterListener(mSensorEventListener);
mContext.getContentResolver().unregisterContentObserver(mSettingsObserver);
Dependency.get(StatusBarStateController.class).removeCallback(mStatusBarStateListener);
KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mKeyguardUpdateCallback);
}
public Uri reportRejectedTouch() {
if (mDataCollector.isEnabled()) {
return mDataCollector.reportRejectedTouch();

9
packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java
View File

@@ -65,6 +65,7 @@ public class FalsingManagerProxy implements FalsingManager {
public void onPluginConnected(FalsingPlugin plugin, Context context) {
FalsingManager pluginFalsingManager = plugin.getFalsingManager(context);
if (pluginFalsingManager != null) {
mInternalFalsingManager.cleanup();
mInternalFalsingManager = pluginFalsingManager;
}
}
@@ -92,6 +93,9 @@ public class FalsingManagerProxy implements FalsingManager {
public void setupFalsingManager(Context context) {
boolean brightlineEnabled = DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_SYSTEMUI, BRIGHTLINE_FALSING_MANAGER_ENABLED, true);
if (mInternalFalsingManager != null) {
mInternalFalsingManager.cleanup();
}
if (!brightlineEnabled) {
mInternalFalsingManager = new FalsingManagerImpl(context);
} else {
@@ -290,4 +294,9 @@ public class FalsingManagerProxy implements FalsingManager {
public void dump(PrintWriter pw) {
mInternalFalsingManager.dump(pw);
}
@Override
public void cleanup() {
mInternalFalsingManager.cleanup();
}
}

5
packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java
View File

@@ -309,6 +309,11 @@ public class BrightLineFalsingManager implements FalsingManager {
public void dump(PrintWriter printWriter) {
}
@Override
public void cleanup() {
unregisterSensors();
}
static void logDebug(String msg) {
logDebug(msg, null);
}