Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31b55249 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Do not show the custom views of spoofing notitifactions. 

Fixes: 189189308
Fixes: 189189219
Fixes: 189189310
Fixes: 189078626
Test: lots of manual testing with custom views
Change-Id: I069a83288f72803b6d0956899a44a527a7758c18
parent 5262ee15

core/java/android/app/Notification.java

+29 −7
Original line number Diff line number Diff line
@@ -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);

    }
@@ -5804,7 +5806,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) {
@@ -5820,8 +5822,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;

        }



        /**
@@ -5829,7 +5847,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;

            }
@@ -5934,7 +5952,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;
@@ -6383,7 +6401,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,
@@ -6414,6 +6432,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.

         *
@@ -6563,7 +6585,7 @@ public class Notification implements Parcelable 
        public boolean usesTemplate() {

            return (mN.contentView == null && mN.headsUpContentView == null

                    && mN.bigContentView == null)

                    || (mStyle != null && mStyle.displayCustomViewInline());

                    || styleDisplaysCustomViewInline();

        }

    }