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

Commit 352fb482 authored by Zak Cohen's avatar Zak Cohen
Browse files

RemoteViews - Always load new ApplicationInfo from PackageManager. 

Always load ApplicationInfo object needed for RemoteViews Contexts directly
from PackageManager. The key used is the package name.

Previously this object was read from the RemoteViews bundle, which was
provided by the Widget providing app, and this object could not be relied
on to have accurate data fields.

Bug: 376028556
Flag: EXEMPT Security Fix
Test: atest CtsWidgetTestCases:RemoteViewsActivityTest#testApplicationInfo
Change-Id: Ie263b51fd2c2bdbf9d622533bb3f77d9f3f7181e
parent ff4d832c

core/java/android/appwidget/AppWidgetHostView.java

+0 −4
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.app.Activity;

import android.app.ActivityOptions;

import android.app.LoadedApk;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.ComponentName;

import android.content.Context;
@@ -753,9 +752,6 @@ public class AppWidgetHostView extends FrameLayout implements AppWidgetHost.AppW 
     */

    protected Context getRemoteContextEnsuringCorrectCachedApkPath() {

        try {

            ApplicationInfo expectedAppInfo = mInfo.providerInfo.applicationInfo;

            LoadedApk.checkAndUpdateApkPaths(expectedAppInfo);

            // Return if cloned successfully, otherwise default

            Context newContext = mContext.createApplicationContext(

                    mInfo.providerInfo.applicationInfo,

                    Context.CONTEXT_RESTRICTED);

core/java/android/widget/RemoteViews.java

+8 −3
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import android.app.Activity; 
import android.app.ActivityOptions;

import android.app.ActivityThread;

import android.app.Application;

import android.app.LoadedApk;

import android.app.PendingIntent;

import android.app.RemoteInput;

import android.appwidget.AppWidgetHostView;
@@ -8484,8 +8483,14 @@ public class RemoteViews implements Parcelable, Filter { 
                return context;

            }

            try {

                LoadedApk.checkAndUpdateApkPaths(mApplication);

                Context applicationContext = context.createApplicationContext(mApplication,

                // Use PackageManager as the source of truth for application information, rather

                // than the parceled ApplicationInfo provided by the app.

                ApplicationInfo sanitizedApplication =

                        context.getPackageManager().getApplicationInfoAsUser(

                                mApplication.packageName, 0,

                                UserHandle.getUserId(mApplication.uid));

                Context applicationContext = context.createApplicationContext(

                        sanitizedApplication,

                        Context.CONTEXT_RESTRICTED);

                // Get the correct apk paths while maintaining the current context's configuration.

                return applicationContext.createConfigurationContext(