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

Merge "Remove warning trampoline toast for beta" into sc-dev

Browse Source
This commit is contained in:
Bernardo Rufino
2021-03-25 17:45:51 +00:00
committed by Android (Google) Code Review
parent cf4b4e4d3c b6c89806ee
commit 26d325693c
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10675,8 +10675,6 @@ public class NotificationManagerService extends SystemService {
* TODO(b/161957908): Remove dogfooder toast.
*/
private class NotificationTrampolineCallback implements BackgroundActivityStartCallback {
private final Set<String> mPackagesShown = new ArraySet<>();
@Override
public boolean isActivityStartAllowed(Collection<IBinder> tokens, int uid,
String packageName) {
@@ -10689,16 +10687,12 @@ public class NotificationManagerService extends SystemService {
}
String logcatMessage =
"Indirect notification activity start (trampoline) from " + packageName;
// Call to toast() method is posted to mHandler below to offload PM lookup from the
// activity start path
if (CompatChanges.isChangeEnabled(NOTIFICATION_TRAMPOLINE_BLOCK, uid)) {
mHandler.post(() -> toast(packageName, uid, /* blocked */ true));
// 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 {
if (mPackagesShown.add(packageName)) {
mHandler.post(() -> toast(packageName, uid, /* blocked */ false));
}
Slog.w(TAG, logcatMessage + ", this should be avoided for performance reasons");
return true;
}
@@ -10713,7 +10707,7 @@ public class NotificationManagerService extends SystemService {
&& !CompatChanges.isChangeEnabled(NOTIFICATION_TRAMPOLINE_BLOCK, uid);
}
private void toast(String packageName, int uid, boolean blocked) {
private void toast(String packageName, int uid) {
final CharSequence label;
try {
label = mPackageManagerClient.getApplicationLabel(
@@ -10724,8 +10718,7 @@ public class NotificationManagerService extends SystemService {
return;
}
mUiHandler.post(() -> Toast.makeText(getUiContext(),
label + " launch " + (blocked ? "blocked" : "will be blocked")
+ "\ng.co/dev/trampolines", Toast.LENGTH_LONG).show());
label + " launch blocked\ng.co/dev/trampolines", Toast.LENGTH_LONG).show());
}
}
}