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

Merge "Add debug logging to CommunalManagerService"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-12-08 05:45:16 +00:00
committed by Android (Google) Code Review
parent ebc8c217c2 6b0fbb2cfb
commit b20887efa4
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/communal/CommunalManagerService.java
View File

@@ -84,6 +84,10 @@ public final class CommunalManagerService extends SystemService {
@Override
public Intent intercept(ActivityInterceptorInfo info) {
if (!shouldIntercept(info.aInfo)) {
if (DEBUG) {
Slog.d(TAG, "Activity allowed, not intercepting: "
+ info.aInfo.getComponentName());
}
return null;
}
@@ -188,8 +192,17 @@ public final class CommunalManagerService extends SystemService {
return true;
}
return isChangeEnabled(ALLOW_COMMUNAL_MODE_WITH_USER_CONSENT, appInfo)
&& getUserEnabledApps().contains(appInfo.packageName);
if (!isChangeEnabled(ALLOW_COMMUNAL_MODE_WITH_USER_CONSENT, appInfo)) {
if (DEBUG) Slog.d(TAG, "App is not allowlisted: " + appInfo.packageName);
return false;
}
if (!getUserEnabledApps().contains(appInfo.packageName)) {
if (DEBUG) Slog.d(TAG, "App does not have user consent: " + appInfo.packageName);
return false;
}
return true;
}
private boolean isActiveDream(ApplicationInfo appInfo) {
@@ -219,6 +232,10 @@ public final class CommunalManagerService extends SystemService {
final boolean showWhenLocked =
(activityInfo.flags & ActivityInfo.FLAG_SHOW_WHEN_LOCKED) != 0;
if (!showWhenLocked) {
if (DEBUG) {
Slog.d(TAG, "Activity does not contain showWhenLocked attribute: "
+ activityInfo.getComponentName());
}
return true;
}