Moved AppWarnings handling to ActivityTaskManagerService (15/n)
Also removed CompatModeDialog since it has been disabled for more than
5 years now.
Test: Existing tests pass
Bug: 80414790
Change-Id: Ide697f9f6e6ed176c54bfcc1b800d4dba59c1d06
diff --git a/services/core/java/com/android/server/am/ActivityTaskManagerService.java b/services/core/java/com/android/server/am/ActivityTaskManagerService.java
index 4a0f692..91f2b5f 100644
--- a/services/core/java/com/android/server/am/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityTaskManagerService.java
@@ -132,6 +132,7 @@
import com.android.internal.R;
import com.android.internal.app.IAppOpsService;
import com.android.server.AppOpsService;
+import com.android.server.SystemServiceManager;
import com.android.server.pm.UserManagerService;
import com.android.server.uri.UriGrantsManagerInternal;
import com.android.server.wm.ActivityTaskManagerInternal;
@@ -471,6 +472,8 @@
/** If non-null, we are tracking the time the user spends in the currently focused app. */
AppTimeTracker mCurAppTimeTracker;
+ private AppWarnings mAppWarnings;
+
private FontScaleSettingObserver mFontScaleSettingObserver;
private final class FontScaleSettingObserver extends ContentObserver {
@@ -600,6 +603,8 @@
mGlobalLock = mAm;
mH = new H(mAm.mHandlerThread.getLooper());
mUiHandler = new UiHandler();
+ mAppWarnings = new AppWarnings(
+ this, mUiContext, mH, mUiHandler, SystemServiceManager.ensureSystemDir());
mTempConfig.setToDefaults();
mTempConfig.setLocales(LocaleList.getDefault());
@@ -4013,7 +4018,7 @@
synchronized (mGlobalLock) {
final long origId = Binder.clearCallingIdentity();
try {
- mAm.mAppWarnings.alwaysShowUnsupportedCompileSdkWarning(activity);
+ mAppWarnings.alwaysShowUnsupportedCompileSdkWarning(activity);
} finally {
Binder.restoreCallingIdentity(origId);
}
@@ -4498,7 +4503,7 @@
final boolean isDensityChange = (changes & ActivityInfo.CONFIG_DENSITY) != 0;
if (isDensityChange && displayId == DEFAULT_DISPLAY) {
- mAm.mAppWarnings.onDensityChanged();
+ mAppWarnings.onDensityChanged();
mAm.killAllBackgroundProcessesExcept(N,
ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE);
@@ -4883,6 +4888,10 @@
return mPmInternal;
}
+ AppWarnings getAppWarningsLocked() {
+ return mAppWarnings;
+ }
+
void logAppTooSlow(WindowProcessController app, long startTime, String msg) {
if (true || Build.IS_USER) {
return;
@@ -5353,5 +5362,19 @@
mPidMap.remove(pid);
}
}
+
+ @Override
+ public void onPackageDataCleared(String name) {
+ synchronized (mGlobalLock) {
+ mAppWarnings.onPackageDataCleared(name);
+ }
+ }
+
+ @Override
+ public void onPackageUninstalled(String name) {
+ synchronized (mGlobalLock) {
+ mAppWarnings.onPackageUninstalled(name);
+ }
+ }
}
}