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

Commit dec80520 authored by Zimuzo Ezeozue's avatar Zimuzo Ezeozue Committed by Automerger Merge Worker
Browse files

Merge "Add 5s ANR delay during transcoding" into sc-dev am: d2ae678d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13872930

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7febbd2c8e5d7b845ef598d92bd9f4657aae333
parents c13f9cc2 d2ae678d

services/core/java/com/android/server/StorageManagerService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -962,7 +962,7 @@ class StorageManagerService extends IStorageManager.Stub 
            }

            }





            int delay = DeviceConfig.getInt(DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,

            int delay = DeviceConfig.getInt(DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,

                    ANR_DELAY_MILLIS_DEVICE_CONFIG_KEY, 0);

                    ANR_DELAY_MILLIS_DEVICE_CONFIG_KEY, 5000);

            Slog.v(TAG, "getAnrDelayMillis for " + packageName + ". " + delay + "ms");

            Slog.v(TAG, "getAnrDelayMillis for " + packageName + ". " + delay + "ms");

            return delay;

            return delay;

        }

        }