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

Merge "Do not show the notification prompt on noDisplay activities" into tm-dev am: 2ca8b4def9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17875004

Change-Id: I94a9ab7cdfd5effac9b39a9bec71b8a161d633ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nate Myren
2022-04-21 15:53:12 +00:00
committed by Automerger Merge Worker
parent 8a40f4ef67 2ca8b4def9
commit d0be9bd9fb
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/policy/PermissionPolicyService.java
View File

@@ -57,6 +57,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.PackageManagerInternal;
import android.content.pm.PackageManagerInternal.PackageListObserver;
import android.content.pm.PermissionInfo;
import android.content.res.Resources;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
@@ -78,10 +79,12 @@ import android.util.Pair;
import android.util.Slog;
import android.util.SparseBooleanArray;
import com.android.internal.R;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.app.IAppOpsCallback;
import com.android.internal.app.IAppOpsService;
import com.android.internal.infra.AndroidFuture;
import com.android.internal.policy.AttributeCache;
import com.android.internal.util.IntPair;
import com.android.internal.util.function.pooled.PooledLambda;
import com.android.server.FgThread;
@@ -1064,7 +1067,8 @@ public final class PermissionPolicyService extends SystemService {
ActivityInterceptorInfo info) {
super.onActivityLaunched(taskInfo, activityInfo, info);
if (!shouldShowNotificationDialogOrClearFlags(taskInfo,
activityInfo.packageName, info.intent, info.checkedOptions, true)) {
activityInfo.packageName, info.intent, info.checkedOptions, true)
|| isNoDisplayActivity(activityInfo)) {
return;
}
UserHandle user = UserHandle.of(taskInfo.userId);
@@ -1139,6 +1143,22 @@ public final class PermissionPolicyService extends SystemService {
taskInfo, currPkg, intent, null, false);
}
private boolean isNoDisplayActivity(@NonNull ActivityInfo aInfo) {
final int themeResource = aInfo.getThemeResource();
if (themeResource == Resources.ID_NULL) {
return false;
}
boolean noDisplay = false;
final AttributeCache.Entry ent = AttributeCache.instance()
.get(aInfo.packageName, themeResource, R.styleable.Window, 0);
if (ent != null) {
noDisplay = ent.array.getBoolean(R.styleable.Window_windowNoDisplay, false);
}
return noDisplay;
}
/**
* Determine if a particular task is in the proper state to show a system-triggered
* permission prompt. A prompt can be shown if the task is just starting, or the task is