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

Merge "Put bad apps in the RESTRICTED bucket." into sc-dev

Browse Source
This commit is contained in:
Kweku Adams
2021-05-07 15:35:46 +00:00
committed by Android (Google) Code Review
parent 21e2de2d4c 3901c1be65
commit 07a90f5272
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/am/AppErrors.java
View File

@@ -32,6 +32,7 @@ import android.app.ActivityOptions;
import android.app.AnrController; import android.app.AnrController;
import android.app.ApplicationErrorReport; import android.app.ApplicationErrorReport;
import android.app.ApplicationExitInfo; import android.app.ApplicationExitInfo;
import android.app.usage.UsageStatsManager;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -57,7 +58,9 @@ import com.android.internal.annotations.GuardedBy;
import com.android.internal.app.ProcessMap; import com.android.internal.app.ProcessMap;
import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.server.LocalServices;
import com.android.server.PackageWatchdog; import com.android.server.PackageWatchdog;
import com.android.server.usage.AppStandbyInternal;
import com.android.server.wm.WindowProcessController; import com.android.server.wm.WindowProcessController;
import java.io.FileDescriptor; import java.io.FileDescriptor;
@@ -885,6 +888,16 @@ class AppErrors {
} }
errState.setBad(true); errState.setBad(true);
app.setRemoved(true); app.setRemoved(true);
final AppStandbyInternal appStandbyInternal =
LocalServices.getService(AppStandbyInternal.class);
if (appStandbyInternal != null) {
appStandbyInternal.restrictApp(
// Sometimes the processName is the same as the package name, so use
// that if we don't have the ApplicationInfo object.
// AppStandbyController will just return if it can't find the app.
app.info != null ? app.info.packageName : processName,
userId, UsageStatsManager.REASON_SUB_FORCED_SYSTEM_FLAG_BUGGY);
}
// Don't let services in this process be restarted and potentially // Don't let services in this process be restarted and potentially
// annoy the user repeatedly. Unless it is persistent, since those // annoy the user repeatedly. Unless it is persistent, since those
// processes run critical code. // processes run critical code.