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

Rebase enabled overlays for every PackageParser.generateActivityInfo() call

Browse Source 
PackageParser.generateActivityInfo() generates ApplicationInfo as well.
So enabled overlays should be rebased for the ApplicationInfo to keep
the overlay path info correctly.

Test: building succeeded and tested on sailfish device.
Bug: 37179769
Change-Id: I12727fd27c1d4cf37ad63b333792108a82efccd6
This commit is contained in:
Jaekyun Seok
2017-04-09 08:56:00 +09:00
parent ec8f353668
commit 467ef375b7
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -4083,6 +4083,24 @@ public class PackageManagerService extends IPackageManager.Stub {
return updateFlagsForComponent(flags, userId, intent /*cookie*/);
}
private ActivityInfo generateActivityInfo(ActivityInfo ai, int flags, PackageUserState state,
int userId) {
ActivityInfo ret = PackageParser.generateActivityInfo(ai, flags, state, userId);
if (ret != null) {
rebaseEnabledOverlays(ret.applicationInfo, userId);
}
return ret;
}
private ActivityInfo generateActivityInfo(PackageParser.Activity a, int flags,
PackageUserState state, int userId) {
ActivityInfo ai = PackageParser.generateActivityInfo(a, flags, state, userId);
if (ai != null) {
rebaseEnabledOverlays(ai.applicationInfo, userId);
}
return ai;
}
@Override
public ActivityInfo getActivityInfo(ComponentName component, int flags, int userId) {
if (!sUserManager.exists(userId)) return null;
@@ -4096,12 +4114,11 @@ public class PackageManagerService extends IPackageManager.Stub {
if (a != null && mSettings.isEnabledAndMatchLPr(a.info, flags, userId)) {
PackageSetting ps = mSettings.mPackages.get(component.getPackageName());
if (ps == null) return null;
return PackageParser.generateActivityInfo(a, flags, ps.readUserState(userId),
userId);
return generateActivityInfo(a, flags, ps.readUserState(userId), userId);
}
if (mResolveComponentName.equals(component)) {
return PackageParser.generateActivityInfo(mResolveActivity, flags,
new PackageUserState(), userId);
return generateActivityInfo(mResolveActivity, flags, new PackageUserState(),
userId);
}
}
return null;
@@ -4142,12 +4159,7 @@ public class PackageManagerService extends IPackageManager.Stub {
if (a != null && mSettings.isEnabledAndMatchLPr(a.info, flags, userId)) {
PackageSetting ps = mSettings.mPackages.get(component.getPackageName());
if (ps == null) return null;
ActivityInfo ri = PackageParser.generateActivityInfo(a, flags,
ps.readUserState(userId), userId);
if (ri != null) {
rebaseEnabledOverlays(ri.applicationInfo, userId);
}
return ri;
return generateActivityInfo(a, flags, ps.readUserState(userId), userId);
}
}
return null;
@@ -12307,8 +12319,7 @@ public class PackageManagerService extends IPackageManager.Stub {
return null;
}
final PackageUserState userState = ps.readUserState(userId);
ActivityInfo ai = PackageParser.generateActivityInfo(activity, mFlags,
userState, userId);
ActivityInfo ai = generateActivityInfo(activity, mFlags, userState, userId);
if (ai == null) {
return null;
}