Loading services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +0 −5 Original line number Diff line number Diff line Loading @@ -1985,11 +1985,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { CryptoTestHelper.runAndLogSelfTest(); } public String[] getPersonalAppsForSuspension(@UserIdInt int userId) { return PersonalAppsSuspensionHelper.forUser(mContext, userId) .getPersonalAppsForSuspension(); } public long systemCurrentTimeMillis() { return System.currentTimeMillis(); } services/devicepolicy/java/com/android/server/devicepolicy/PersonalAppsSuspensionHelper.java +0 −5 Original line number Diff line number Diff line Loading @@ -37,7 +37,6 @@ import android.provider.Telephony; import android.text.TextUtils; import android.util.ArraySet; import android.util.IndentingPrintWriter; import android.util.Log; import android.view.accessibility.AccessibilityManager; import android.view.accessibility.IAccessibilityManager; import android.view.inputmethod.InputMethodInfo; Loading Loading @@ -107,10 +106,6 @@ public final class PersonalAppsSuspensionHelper { for (final String pkg : unsuspendablePackages) { result.remove(pkg); } if (Log.isLoggable(LOG_TAG, Log.INFO)) { Slogf.i(LOG_TAG, "Packages subject to suspension: %s", String.join(",", result)); } return result.toArray(new String[0]); } Loading services/devicepolicy/java/com/android/server/devicepolicy/PolicyEnforcerCallbacks.java +1 −0 Original line number Diff line number Diff line Loading @@ -375,6 +375,7 @@ final class PolicyEnforcerCallbacks { private static void suspendPersonalAppsInPackageManager(Context context, int userId) { final String[] appsToSuspend = PersonalAppsSuspensionHelper.forUser(context, userId) .getPersonalAppsForSuspension(); Slogf.i(LOG_TAG, "Suspending personal apps: %s", String.join(",", appsToSuspend)); final String[] failedApps = LocalServices.getService(PackageManagerInternal.class) .setPackagesSuspendedByAdmin(userId, appsToSuspend, true); if (!ArrayUtils.isEmpty(failedApps)) { Loading services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java +0 −5 Original line number Diff line number Diff line Loading @@ -441,11 +441,6 @@ public class DevicePolicyManagerServiceTestable extends DevicePolicyManagerServi @Override public void runCryptoSelfTest() {} @Override public String[] getPersonalAppsForSuspension(int userId) { return new String[]{}; } public void setSystemCurrentTimeMillis(long value) { mCurrentTimeMillis = value; } Loading Loading
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +0 −5 Original line number Diff line number Diff line Loading @@ -1985,11 +1985,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { CryptoTestHelper.runAndLogSelfTest(); } public String[] getPersonalAppsForSuspension(@UserIdInt int userId) { return PersonalAppsSuspensionHelper.forUser(mContext, userId) .getPersonalAppsForSuspension(); } public long systemCurrentTimeMillis() { return System.currentTimeMillis(); }
services/devicepolicy/java/com/android/server/devicepolicy/PersonalAppsSuspensionHelper.java +0 −5 Original line number Diff line number Diff line Loading @@ -37,7 +37,6 @@ import android.provider.Telephony; import android.text.TextUtils; import android.util.ArraySet; import android.util.IndentingPrintWriter; import android.util.Log; import android.view.accessibility.AccessibilityManager; import android.view.accessibility.IAccessibilityManager; import android.view.inputmethod.InputMethodInfo; Loading Loading @@ -107,10 +106,6 @@ public final class PersonalAppsSuspensionHelper { for (final String pkg : unsuspendablePackages) { result.remove(pkg); } if (Log.isLoggable(LOG_TAG, Log.INFO)) { Slogf.i(LOG_TAG, "Packages subject to suspension: %s", String.join(",", result)); } return result.toArray(new String[0]); } Loading
services/devicepolicy/java/com/android/server/devicepolicy/PolicyEnforcerCallbacks.java +1 −0 Original line number Diff line number Diff line Loading @@ -375,6 +375,7 @@ final class PolicyEnforcerCallbacks { private static void suspendPersonalAppsInPackageManager(Context context, int userId) { final String[] appsToSuspend = PersonalAppsSuspensionHelper.forUser(context, userId) .getPersonalAppsForSuspension(); Slogf.i(LOG_TAG, "Suspending personal apps: %s", String.join(",", appsToSuspend)); final String[] failedApps = LocalServices.getService(PackageManagerInternal.class) .setPackagesSuspendedByAdmin(userId, appsToSuspend, true); if (!ArrayUtils.isEmpty(failedApps)) { Loading
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java +0 −5 Original line number Diff line number Diff line Loading @@ -441,11 +441,6 @@ public class DevicePolicyManagerServiceTestable extends DevicePolicyManagerServi @Override public void runCryptoSelfTest() {} @Override public String[] getPersonalAppsForSuspension(int userId) { return new String[]{}; } public void setSystemCurrentTimeMillis(long value) { mCurrentTimeMillis = value; } Loading