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

Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2017-06-09 20:23:14 +00:00
committed by Android (Google) Code Review
parent fc926a938e da1247a076
commit c017d299ce
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/content/pm/PackageInstaller.java
View File

@@ -24,6 +24,7 @@ import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
import android.annotation.SystemApi;
import android.app.ActivityManager;
import android.app.AppGlobals;
import android.content.Intent;
import android.content.IntentSender;
import android.content.pm.PackageManager.InstallReason;
@@ -1355,6 +1356,16 @@ public class PackageInstaller {
* if unavailable.
*/
public @Nullable Bitmap getAppIcon() {
if (appIcon == null) {
// Icon may have been omitted for calls that return bulk session
// lists, so try fetching the specific icon.
try {
appIcon = AppGlobals.getPackageManager().getPackageInstaller()
.getSessionInfo(sessionId).appIcon;
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
return appIcon;
}

4
services/core/java/com/android/server/pm/PackageInstallerService.java
View File

@@ -848,7 +848,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub {
for (int i = 0; i < mSessions.size(); i++) {
final PackageInstallerSession session = mSessions.valueAt(i);
if (session.userId == userId) {
result.add(session.generateInfo());
result.add(session.generateInfo(false));
}
}
}
@@ -866,7 +866,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub {
final PackageInstallerSession session = mSessions.valueAt(i);
if (Objects.equals(session.installerPackageName, installerPackageName)
&& session.userId == userId) {
result.add(session.generateInfo());
result.add(session.generateInfo(false));
}
}
}

8
services/core/java/com/android/server/pm/PackageInstallerSession.java
View File

@@ -288,6 +288,10 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
}
public SessionInfo generateInfo() {
return generateInfo(true);
}
public SessionInfo generateInfo(boolean includeIcon) {
final SessionInfo info = new SessionInfo();
synchronized (mLock) {
info.sessionId = sessionId;
@@ -302,7 +306,9 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
info.installReason = params.installReason;
info.sizeBytes = params.sizeBytes;
info.appPackageName = params.appPackageName;
info.appIcon = params.appIcon;
if (includeIcon) {
info.appIcon = params.appIcon;
}
info.appLabel = params.appLabel;
}
return info;