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

Merge "Fix a security exception breaking notification inflation." into sc-dev am: f24e216a60

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15038412

Change-Id: I05a143798366cdfb3d84558bf491b3229bd40ed1
This commit is contained in:
Jeff DeCew
2021-06-22 15:08:19 +00:00
committed by Automerger Merge Worker
parent dc52e50c3d f24e216a60
commit 971675d72a
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/app/Notification.java
View File

@@ -5606,14 +5606,24 @@ public class Notification implements Parcelable
final boolean snoozeEnabled = !hideSnoozeButton final boolean snoozeEnabled = !hideSnoozeButton
&& mContext.getContentResolver() != null && mContext.getContentResolver() != null
&& (Settings.Secure.getInt(mContext.getContentResolver(), && isSnoozeSettingEnabled();
Settings.Secure.SHOW_NOTIFICATION_SNOOZE, 0) == 1);
if (snoozeEnabled) { if (snoozeEnabled) {
big.setViewLayoutMarginDimen(R.id.notification_action_list_margin_target, big.setViewLayoutMarginDimen(R.id.notification_action_list_margin_target,
RemoteViews.MARGIN_BOTTOM, 0); RemoteViews.MARGIN_BOTTOM, 0);
} }
} }
private boolean isSnoozeSettingEnabled() {
try {
return Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.SHOW_NOTIFICATION_SNOOZE, 0) == 1;
} catch (SecurityException ex) {
// Most 3p apps can't access this snooze setting, so their NotificationListeners
// would be unable to create notification views if we propagated this exception.
return false;
}
}
/** /**
* Returns the actions that are not contextual. * Returns the actions that are not contextual.
*/ */