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

Commit 3c943276 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Enforce same package name when connecting to widget service" into main

parents 045ff263 3228124a

core/java/android/widget/RemoteViews.java

+10 −0
Original line number Diff line number Diff line
@@ -1564,6 +1564,16 @@ public class RemoteViews implements Parcelable, Filter { 
            final Context context = ActivityThread.currentApplication();



            final CompletableFuture<RemoteCollectionItems> result = new CompletableFuture<>();

            String contextPackageName = context.getPackageName();

            ComponentName intentComponent = intent.getComponent();

            if (contextPackageName != null

                    && intentComponent != null

                    && (!contextPackageName.equals(intentComponent.getPackageName()))) {

                // We shouldn't allow for connections to other packages

                result.complete(new RemoteCollectionItems.Builder().build());

                return result;

            }



            context.bindService(intent, Context.BindServiceFlags.of(Context.BIND_AUTO_CREATE),

                    result.defaultExecutor(), new ServiceConnection() {

                        @Override