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

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

Merge "Setup AnrController for StorageManagerService" into sc-dev am: 7bbf564d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iffb30c07507abfdc6bb0336d5ebd3043c5f53cbd
parents 9a614021 7bbf564d

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

+11 −2
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ class StorageManagerService extends IStorageManager.Stub 
            ZramWriteback.scheduleZramWriteback(mContext);

        }



        updateTranscodeEnabled();

        configureTranscoding();

    }



    /**
@@ -922,7 +922,7 @@ class StorageManagerService extends IStorageManager.Stub 
        }

    }



    private void updateTranscodeEnabled() {

    private void configureTranscoding() {

        // See MediaProvider TranscodeHelper#getBooleanProperty for more information

        boolean transcodeEnabled = false;

        boolean defaultValue = true;
@@ -935,6 +935,15 @@ class StorageManagerService extends IStorageManager.Stub 
                    "transcode_enabled", defaultValue);

        }

        SystemProperties.set("sys.fuse.transcode_enabled", String.valueOf(transcodeEnabled));



        if (transcodeEnabled) {

            LocalServices.getService(ActivityManagerInternal.class)

                    .registerAnrController((packageName, uid) -> {

                        // TODO: Retrieve delay from ExternalStorageService that can check

                        // transcoding status

                        return SystemProperties.getInt("sys.fuse.transcode_anr_delay_ms", 0);

                    });

        }

    }



    /**