Merge "[pm] fix sharedUserSetting during reconcile" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
37d419b7d0
@@ -280,7 +280,7 @@ final class InstallPackageHelper {
|
|||||||
SharedUserSetting requestSharedUserSetting = mPm.mSettings.getSharedUserSettingLPr(
|
SharedUserSetting requestSharedUserSetting = mPm.mSettings.getSharedUserSettingLPr(
|
||||||
request.getScanRequestPackageSetting());
|
request.getScanRequestPackageSetting());
|
||||||
SharedUserSetting resultSharedUserSetting = mPm.mSettings.getSharedUserSettingLPr(
|
SharedUserSetting resultSharedUserSetting = mPm.mSettings.getSharedUserSettingLPr(
|
||||||
request.getScanRequestPackageSetting());
|
request.getScannedPackageSetting());
|
||||||
if (requestSharedUserSetting != null
|
if (requestSharedUserSetting != null
|
||||||
&& requestSharedUserSetting != resultSharedUserSetting) {
|
&& requestSharedUserSetting != resultSharedUserSetting) {
|
||||||
// shared user changed, remove from old shared user
|
// shared user changed, remove from old shared user
|
||||||
|
|||||||
Reference in New Issue
Block a user