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

Merge "Remove trampoline toast" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-02 17:49:54 +00:00
committed by Android (Google) Code Review
parent f5ee8cf3b8 b73787e9a5
commit 80e8dc21b3
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11073,8 +11073,6 @@ public class NotificationManagerService extends SystemService {
String logcatMessage =
"Indirect notification activity start (trampoline) from " + packageName;
if (blockTrampoline(uid)) {
// Post toast() call to mHandler to offload PM lookup from the activity start path
mHandler.post(() -> toast(packageName, uid));
Slog.e(TAG, logcatMessage + " blocked");
return false;
} else {
@@ -11098,19 +11096,5 @@ public class NotificationManagerService extends SystemService {
return tokens.contains(ALLOWLIST_TOKEN)
&& !CompatChanges.isChangeEnabled(NOTIFICATION_TRAMPOLINE_BLOCK, uid);
}
private void toast(String packageName, int uid) {
final CharSequence label;
try {
label = mPackageManagerClient.getApplicationLabel(
mPackageManager.getApplicationInfo(packageName, 0,
UserHandle.getUserId(uid)));
} catch (RemoteException e) {
Slog.e(TAG, "Unexpected exception obtaining app label from PackageManager", e);
return;
}
mUiHandler.post(() -> Toast.makeText(getUiContext(),
label + " launch blocked\ng.co/dev/trampolines", Toast.LENGTH_LONG).show());
}
}
}