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

Merge "Do not show the custom views of spoofing notitifactions." into sc-dev

Browse Source
This commit is contained in:
Jeff DeCew
2021-06-01 18:24:21 +00:00
committed by Android (Google) Code Review
parent 37de895517 31b55249e8
commit 3c3af99d00
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -450,10 +450,12 @@ public class Notification implements Parcelable
STANDARD_LAYOUTS.add(R.layout.notification_template_material_big_text);
STANDARD_LAYOUTS.add(R.layout.notification_template_material_inbox);
STANDARD_LAYOUTS.add(R.layout.notification_template_material_messaging);
STANDARD_LAYOUTS.add(R.layout.notification_template_material_big_messaging);
STANDARD_LAYOUTS.add(R.layout.notification_template_material_conversation);
STANDARD_LAYOUTS.add(R.layout.notification_template_material_media);
STANDARD_LAYOUTS.add(R.layout.notification_template_material_big_media);
STANDARD_LAYOUTS.add(R.layout.notification_template_material_call);
STANDARD_LAYOUTS.add(R.layout.notification_template_material_big_call);
STANDARD_LAYOUTS.add(R.layout.notification_template_header);
}
@@ -5817,7 +5819,7 @@ public class Notification implements Parcelable
* @hide
*/
public RemoteViews createContentView(boolean increasedHeight) {
if (mN.contentView != null && useExistingRemoteView()) {
if (useExistingRemoteView(mN.contentView)) {
return fullyCustomViewRequiresDecoration(false /* fromStyle */)
? minimallyDecoratedContentView(mN.contentView) : mN.contentView;
} else if (mStyle != null) {
@@ -5833,8 +5835,24 @@ public class Notification implements Parcelable
return applyStandardTemplate(getBaseLayoutResource(), p, null /* result */);
}
private boolean useExistingRemoteView() {
return mStyle == null || !mStyle.displayCustomViewInline();
private boolean useExistingRemoteView(RemoteViews customContent) {
if (customContent == null) {
return false;
}
if (styleDisplaysCustomViewInline()) {
// the provided custom view is intended to be wrapped by the style.
return false;
}
if (fullyCustomViewRequiresDecoration(false)
&& STANDARD_LAYOUTS.contains(customContent.getLayoutId())) {
// If the app's custom views are objects returned from Builder.create*ContentView()
// then the app is most likely attempting to spoof the user. Even if they are not,
// the result would be broken (b/189189308) so we will ignore it.
Log.w(TAG, "For apps targeting S, a custom content view that is a modified "
+ "version of any standard layout is disallowed.");
return false;
}
return true;
}
/**
@@ -5842,7 +5860,7 @@ public class Notification implements Parcelable
*/
public RemoteViews createBigContentView() {
RemoteViews result = null;
if (mN.bigContentView != null && useExistingRemoteView()) {
if (useExistingRemoteView(mN.bigContentView)) {
return fullyCustomViewRequiresDecoration(false /* fromStyle */)
? minimallyDecoratedBigContentView(mN.bigContentView) : mN.bigContentView;
}
@@ -5947,7 +5965,7 @@ public class Notification implements Parcelable
* @hide
*/
public RemoteViews createHeadsUpContentView(boolean increasedHeight) {
if (mN.headsUpContentView != null && useExistingRemoteView()) {
if (useExistingRemoteView(mN.headsUpContentView)) {
return fullyCustomViewRequiresDecoration(false /* fromStyle */)
? minimallyDecoratedHeadsUpContentView(mN.headsUpContentView)
: mN.headsUpContentView;
@@ -6396,7 +6414,7 @@ public class Notification implements Parcelable
mN.reduceImageSizes(mContext);
if (mContext.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.N
&& (useExistingRemoteView())) {
&& !styleDisplaysCustomViewInline()) {
if (mN.contentView == null) {
mN.contentView = createContentView();
mN.extras.putInt(EXTRA_REBUILD_CONTENT_VIEW_ACTION_COUNT,
@@ -6427,6 +6445,10 @@ public class Notification implements Parcelable
return mN;
}
private boolean styleDisplaysCustomViewInline() {
return mStyle != null && mStyle.displayCustomViewInline();
}
/**
* Apply this Builder to an existing {@link Notification} object.
*
@@ -6576,7 +6598,7 @@ public class Notification implements Parcelable
public boolean usesTemplate() {
return (mN.contentView == null && mN.headsUpContentView == null
&& mN.bigContentView == null)
|| (mStyle != null && mStyle.displayCustomViewInline());
|| styleDisplaysCustomViewInline();
}
}