Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e01d029 authored by TYM Tsai's avatar TYM Tsai Committed by Android (Google) Code Review
Browse files

Merge "Flag removal: wait_application_killed" into main

parents ae964254 a0bc03e8

core/java/android/content/pm/flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -239,14 +239,6 @@ flag { 
    is_fixed_read_only: true

}



flag {

    name: "wait_application_killed"

    namespace: "package_manager_service"

    description: "Feature flag to control whether to wait until the application is killed when clear application data"

    bug: "31009094"

    is_fixed_read_only: true

}



flag {

    name: "component_state_changed_metrics"

    namespace: "package_manager_service"

services/core/java/com/android/server/pm/PackageFreezer.java

+1 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.SpecialUsers.CanBeALL;

import android.annotation.UserIdInt;

import android.content.pm.Flags;

import android.content.pm.PackageManager;



import dalvik.system.CloseGuard;
@@ -85,7 +84,7 @@ final class PackageFreezer implements AutoCloseable { 
            ps = mPm.mSettings.getPackageLPr(mPackageName);

        }

        if (ps != null) {

            if (waitAppKilled && Flags.waitApplicationKilled()) {

            if (waitAppKilled) {

                mPm.killApplicationSync(ps.getPackageName(), ps.getAppId(), userId, killReason,

                        exitInfoReason);

            } else {