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

Merge "Warning if app targeting O posts a notification with no channel" into oc-dev

Browse Source
This commit is contained in:
Geoffrey Pitsch
2017-04-17 22:59:01 +00:00
committed by Android (Google) Code Review
parent 8604ac3af5 86c11e605e
commit dc2dd6ed9b
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,6 +97,7 @@ import android.media.AudioManagerInternal;
import android.media.IRingtonePlayer;
import android.net.Uri;
import android.os.Binder;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
@@ -3185,16 +3186,16 @@ public class NotificationManagerService extends SystemService {
// STOPSHIP TODO: should throw instead of logging or toasting.
// throw new IllegalArgumentException(noChannelStr);
Log.e(TAG, noChannelStr);
final String noChannelToastStr =
"Developer warning for package \"" + pkg + "\"\n" +
doDebugOnlyToast("Developer warning for package \"" + pkg + "\"\n" +
"Failed to post notification on channel \"" + channelId + "\"\n" +
"See log for more details";
Toast noChannelToast =
Toast.makeText(getContext(), noChannelToastStr, Toast.LENGTH_LONG);
noChannelToast.show();
"See log for more details");
return;
} else if (channelId == null && shouldWarnUseChannels(pkg, notificationUid)) {
// STOPSHIP TODO: remove once default channel is removed for all apps that target O.
doDebugOnlyToast("Developer warning for package \"" + pkg + "\"\n" +
"Posted notification should specify a channel");
}
final StatusBarNotification n = new StatusBarNotification(
pkg, opPkg, id, tag, notificationUid, callingPid, notification,
user, null, System.currentTimeMillis());
@@ -3226,6 +3227,26 @@ public class NotificationManagerService extends SystemService {
idOut[0] = id;
}
private void doDebugOnlyToast(CharSequence toastText) {
if (Build.IS_DEBUGGABLE) {
Toast toast = Toast.makeText(getContext(), toastText, Toast.LENGTH_LONG);
toast.show();
}
}
// STOPSHIP - Remove once RankingHelper deletes default channel for all apps targeting O.
private boolean shouldWarnUseChannels(String pkg, int uid) {
try {
final int userId = UserHandle.getUserId(uid);
final ApplicationInfo applicationInfo =
mPackageManagerClient.getApplicationInfoAsUser(pkg, 0, userId);
return applicationInfo.targetSdkVersion > Build.VERSION_CODES.N_MR1;
} catch (NameNotFoundException e) {
Slog.e(TAG, e.toString());
return false;
}
}
private int resolveNotificationUid(String opPackageName, int callingUid, int userId) {
// The system can post notifications on behalf of any package it wants
if (isCallerSystem() && opPackageName != null && !"android".equals(opPackageName)) {