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

Merge changes Iba408e53,I751b737d

Browse Source 
* changes:
  [pm] forbid deletion of protected packages
  [pm] fix thread tag
This commit is contained in:
Songchun Fan
2022-09-12 15:30:42 +00:00
committed by Android (Google) Code Review
parent e2f931cd42 15f85c7fa9
commit 0784a7d0cb
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/pm/DeletePackageHelper.java
View File

@@ -673,6 +673,18 @@ final class DeletePackageHelper {
final String packageName = versionedPackage.getPackageName();
final long versionCode = versionedPackage.getLongVersionCode();
if (mPm.mProtectedPackages.isPackageDataProtected(userId, packageName)) {
mPm.mHandler.post(() -> {
try {
Slog.w(TAG, "Attempted to delete protected package: " + packageName);
observer.onPackageDeleted(packageName,
PackageManager.DELETE_FAILED_INTERNAL_ERROR, null);
} catch (RemoteException re) {
}
});
return;
}
try {
if (mPm.mInjector.getLocalService(ActivityTaskManagerInternal.class)
.isBaseOfLockedTask(packageName)) {

2
services/core/java/com/android/server/pm/permission/LegacyPermissionManagerService.java
View File

@@ -46,7 +46,7 @@ import com.android.server.pm.UserManagerService;
* Legacy permission manager service.
*/
public class LegacyPermissionManagerService extends ILegacyPermissionManager.Stub {
private static final String TAG = "PackageManager";
private static final String TAG = "PermissionManager";
/** Injector that can be used to facilitate testing. */
private final Injector mInjector;

2
services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
View File

@@ -168,7 +168,7 @@ import java.util.concurrent.TimeoutException;
*/
public class PermissionManagerServiceImpl implements PermissionManagerServiceInterface {
private static final String TAG = "PackageManager";
private static final String TAG = "PermissionManager";
private static final String LOG_TAG = PermissionManagerServiceImpl.class.getSimpleName();
private static final String SKIP_KILL_APP_REASON_NOTIFICATION_TEST = "skip permission revoke "