Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Work on issue #112467931: APR about content provider without package" into qt-dev

Browse Source 
am: cb9ba4a310

Change-Id: Ie0a3a7634f49fa43c859a7208c5c76522f83ea3d
This commit is contained in:
Dianne Hackborn
2019-05-24 17:17:26 -07:00
committed by android-build-merger
parent 69eeeecbb6 cb9ba4a310
commit d19bed89f8
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 =

8
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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) {
}
}

2
services/core/java/com/android/server/am/BroadcastQueue.java
View File

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

4
services/core/java/com/android/server/am/ProcessList.java
View File

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

5
services/core/java/com/android/server/am/ServiceRecord.java
View File

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

2
services/tests/servicestests/src/com/android/server/webkit/TestSystemImpl.java
View File

@@ -166,7 +166,7 @@ public class TestSystemImpl implements SystemInterface {
pi = userPackages.get(PRIMARY_USER_ID);
if (pi != null && pi.applicationInfo.isSystemApp()) {
return pi.applicationInfo.versionCode;
return pi.applicationInfo.longVersionCode;
}
throw new NameNotFoundException();
}