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

Commit 6f30f18e authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Work on issue #112467931: APR about content provider without package 

While investigating, I found code that is still using the old 32-bit
version code, which should be using the new longVersionCode.  Then I
looked around and found more stuff doing this.  WTF.  Fixed.

Bug: 112467931
Test: manual
Change-Id: I058fe1ef49121b430c7ff96348156a17f529838e
parent 8af0af88

packages/SystemUI/src/com/android/systemui/statusbar/notification/InstantAppNotifier.java

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ public class InstantAppNotifier extends SystemUI 
                            .putExtra(

                                    Intent.EXTRA_VERSION_CODE,

                                    (int) (appInfo.versionCode & 0x7fffffff))

                            .putExtra(Intent.EXTRA_LONG_VERSION_CODE, appInfo.versionCode)

                            .putExtra(Intent.EXTRA_LONG_VERSION_CODE, appInfo.longVersionCode)

                            .putExtra(Intent.EXTRA_INSTANT_APP_FAILURE, pendingIntent);



            PendingIntent webPendingIntent =

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −4
Original line number Diff line number Diff line
@@ -4916,7 +4916,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        AutofillManagerInternal.class);

                if (afm != null) {

                    autofillOptions = afm.getAutofillOptions(

                            app.info.packageName, app.info.versionCode, app.userId);

                            app.info.packageName, app.info.longVersionCode, app.userId);

                }

            }

            ContentCaptureOptions contentCaptureOptions = null;
@@ -6361,8 +6361,8 @@ public class ActivityManagerService extends IActivityManager.Stub 
                    // to run in multiple processes, because this is actually

                    // part of the framework so doesn't make sense to track as a

                    // separate apk in the process.

                    app.addPackage(cpi.applicationInfo.packageName, cpi.applicationInfo.versionCode,

                            mProcessStats);

                    app.addPackage(cpi.applicationInfo.packageName,

                            cpi.applicationInfo.longVersionCode, mProcessStats);

                }

                notifyPackageUse(cpi.applicationInfo.packageName,

                                 PackageManager.NOTIFY_PACKAGE_USE_CONTENT_PROVIDER);
@@ -14998,7 +14998,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                            ApplicationInfo ai = AppGlobals.getPackageManager().

                                    getApplicationInfo(ssp, STOCK_PM_FLAGS, 0);

                            mBatteryStatsService.notePackageInstalled(ssp,

                                    ai != null ? ai.versionCode : 0);

                                    ai != null ? ai.longVersionCode : 0);

                        } catch (RemoteException e) {

                        }

                    }

services/core/java/com/android/server/am/BroadcastQueue.java

+1 −1
Original line number Diff line number Diff line
@@ -1605,7 +1605,7 @@ public final class BroadcastQueue { 
        if (app != null && app.thread != null && !app.killed) {

            try {

                app.addPackage(info.activityInfo.packageName,

                        info.activityInfo.applicationInfo.versionCode, mService.mProcessStats);

                        info.activityInfo.applicationInfo.longVersionCode, mService.mProcessStats);

                maybeAddAllowBackgroundActivityStartsToken(app, r);

                processCurBroadcastLocked(r, app, skipOomAdj);

                return;

services/core/java/com/android/server/am/ProcessList.java

+2 −2
Original line number Diff line number Diff line
@@ -1918,7 +1918,7 @@ public final class ProcessList { 
                // come up (we have a pid but not yet its thread), so keep it.

                if (DEBUG_PROCESSES) Slog.v(TAG_PROCESSES, "App already running: " + app);

                // If this is a new package in the process, add the package to the list

                app.addPackage(info.packageName, info.versionCode, mService.mProcessStats);

                app.addPackage(info.packageName, info.longVersionCode, mService.mProcessStats);

                checkSlow(startTime, "startProcess: done, added package to proc");

                return app;

            }
@@ -1946,7 +1946,7 @@ public final class ProcessList { 
            checkSlow(startTime, "startProcess: done creating new process record");

        } else {

            // If this is a new package in the process, add the package to the list

            app.addPackage(info.packageName, info.versionCode, mService.mProcessStats);

            app.addPackage(info.packageName, info.longVersionCode, mService.mProcessStats);

            checkSlow(startTime, "startProcess: added package to existing proc");

        }

services/core/java/com/android/server/am/ServiceRecord.java

+3 −2
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN 
        }

        if ((serviceInfo.applicationInfo.flags&ApplicationInfo.FLAG_PERSISTENT) == 0) {

            tracker = ams.mProcessStats.getServiceStateLocked(serviceInfo.packageName,

                    serviceInfo.applicationInfo.uid, serviceInfo.applicationInfo.versionCode,

                    serviceInfo.applicationInfo.uid, serviceInfo.applicationInfo.longVersionCode,

                    serviceInfo.processName, serviceInfo.name);

            tracker.applyNewOwner(this);

        }
@@ -530,7 +530,8 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN 
        if (restartTracker == null) {

            if ((serviceInfo.applicationInfo.flags&ApplicationInfo.FLAG_PERSISTENT) == 0) {

                restartTracker = ams.mProcessStats.getServiceStateLocked(serviceInfo.packageName,

                        serviceInfo.applicationInfo.uid, serviceInfo.applicationInfo.versionCode,

                        serviceInfo.applicationInfo.uid,

                        serviceInfo.applicationInfo.longVersionCode,

                        serviceInfo.processName, serviceInfo.name);

            }

            if (restartTracker == null) {