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

Merge "Update trampoline toast message"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-10-23 11:55:59 +00:00
committed by Android (Google) Code Review
parent 00a5b9b4d4 9077db3c0d
commit 661018ab45
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -10077,24 +10077,27 @@ public class NotificationManagerService extends SystemService {
@Override
public boolean isActivityStartAllowed(int uid, String packageName) {
boolean block = CompatChanges.isChangeEnabled(NOTIFICATION_TRAMPOLINE_BLOCK, uid);
if (block || mPackagesShown.add(packageName)) {
mUiHandler.post(() ->
Toast.makeText(getUiContext(),
"Indirect activity start from "
+ packageName + ". "
+ "This will be blocked in S.\n"
+ "See go/s-trampolines.",
Toast.LENGTH_LONG).show());
}
String message =
String toastMessage = "Indirect activity start from " + packageName;
String logcatMessage =
"Indirect notification activity start (trampoline) from " + packageName;
if (block) {
Slog.e(TAG, message + " blocked");
if (CompatChanges.isChangeEnabled(NOTIFICATION_TRAMPOLINE_BLOCK, uid)) {
toast(toastMessage + " blocked.");
Slog.e(TAG, logcatMessage + " blocked");
return false;
} else {
if (mPackagesShown.add(packageName)) {
toast(toastMessage + ". This will be blocked in S.");
}
Slog.w(TAG, logcatMessage + ", this should be avoided for performance reasons");
return true;
}
Slog.w(TAG, message + ", this should be avoided for performance reasons");
return true;
}
private void toast(String message) {
mUiHandler.post(() ->
Toast.makeText(getUiContext(), message + "\nSee go/s-trampolines.",
Toast.LENGTH_LONG).show());
}
}
}