From 71dec41cc08317b70e9ac0072c7604a4cfc83500 Mon Sep 17 00:00:00 2001 From: hkuang Date: Wed, 25 Aug 2021 15:54:10 -0700 Subject: [PATCH] transcoding: Allow acquire service on low ram device. Bug: 189130092 Test: atest MediaTranscodingManagerTest Change-Id: I0fadd4b1dadb9c39d825c9b2020182e16e54660b --- .../java/android/media/MediaTranscodingManager.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/apex/media/framework/java/android/media/MediaTranscodingManager.java b/apex/media/framework/java/android/media/MediaTranscodingManager.java index 93d58d07f81af..7e4799cb477a0 100644 --- a/apex/media/framework/java/android/media/MediaTranscodingManager.java +++ b/apex/media/framework/java/android/media/MediaTranscodingManager.java @@ -22,7 +22,6 @@ import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.app.ActivityManager; import android.content.ContentResolver; import android.content.Context; import android.content.res.AssetFileDescriptor; @@ -121,7 +120,6 @@ public final class MediaTranscodingManager { private final String mPackageName; private final int mPid; private final int mUid; - private final boolean mIsLowRamDevice; private final ExecutorService mExecutor = Executors.newSingleThreadExecutor(); private final HashMap mPendingTranscodingSessions = new HashMap(); private final Object mLock = new Object(); @@ -208,10 +206,7 @@ public final class MediaTranscodingManager { if (!SdkLevel.isAtLeastS()) { return null; } - // Do not try to get the service on AndroidGo (low-ram) devices. - if (mIsLowRamDevice) { - return null; - } + int retryCount = !retry ? 1 : CONNECT_SERVICE_RETRY_COUNT; Log.i(TAG, "get service with retry " + retryCount); for (int count = 1; count <= retryCount; count++) { @@ -429,7 +424,6 @@ public final class MediaTranscodingManager { mPackageName = mContext.getPackageName(); mUid = Os.getuid(); mPid = Os.getpid(); - mIsLowRamDevice = mContext.getSystemService(ActivityManager.class).isLowRamDevice(); } /**