Merge "Work on issue #112467931: APR about content provider without package" into qt-dev (d19bed89) · Commits · e / os / android_frameworks_base

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 =

+4 −4

Original line number	Diff line number	Diff line
		@@ -4919,7 +4919,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;
		@@ -6364,8 +6364,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);
		@@ -15029,7 +15029,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) {
		}
		}

+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;

+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");
		}

+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) {