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

Commit f8c0d70f authored by John Reck's avatar John Reck
Browse files

Revert "Add view inflation device config property" 

This reverts commit 86076a7c.

Reason for revert: Requires apps to have READ_DEVICE_CONFIG permission which they cannot possibly get. Also breaks instant apps (which don't have & can't get that permission)

Bug: 123524494
Test: CtsAccelerationTestCases[instant] passes.
Change-Id: I789a2c9007780331c510802a9f807cc24174be2d
parent 86076a7c

api/system-current.txt

+0 −5
Original line number Diff line number Diff line
@@ -5763,11 +5763,6 @@ package android.provider { 
    field public static final String PROPERTY_PERMISSIONS_HUB_ENABLED = "permissions_hub_enabled";

  }













  public static interface DeviceConfig.Runtime {













    field public static final String NAMESPACE = "runtime";













    field public static final String USE_PRECOMPILED_LAYOUT = "view.precompiled_layout_enabled";













  }



























  public static interface DeviceConfig.RuntimeNative {















    field public static final String NAMESPACE = "runtime_native";















  }

































core/java/android/provider/DeviceConfig.java



+0
−15






























Original line number
Diff line number
Diff line








@@ -149,21 +149,6 @@ public final class DeviceConfig {













        String GENERATE_ACTIONS = "generate_actions";















    }





























    /**













     * Namespace for all runtime related features.













     *













     * @hide













     */













    @SystemApi













    public interface Runtime {













        String NAMESPACE = "runtime";



























        /**













         * Whether or not we use the precompiled layout.













         */













        String USE_PRECOMPILED_LAYOUT = "view.precompiled_layout_enabled";













    }





























    /**















     * Namespace for all runtime native related features.















     *

































core/java/android/view/LayoutInflater.java



+6
−18






























Original line number
Diff line number
Diff line








@@ -33,8 +33,6 @@ import android.os.Handler;













import android.os.Message;















import android.os.SystemProperties;















import android.os.Trace;













import android.provider.DeviceConfig;













import android.text.TextUtils;















import android.util.AttributeSet;















import android.util.Log;















import android.util.TypedValue;









@@ -44,14 +42,13 @@ import android.widget.FrameLayout;













import com.android.internal.R;































import dalvik.system.PathClassLoader;



























import java.io.File;













import java.lang.reflect.Method;















import org.xmlpull.v1.XmlPullParser;















import org.xmlpull.v1.XmlPullParserException;





























import java.io.File;















import java.io.IOException;















import java.lang.reflect.Constructor;













import java.lang.reflect.Method;















import java.util.HashMap;































/**










@@ -81,6 +78,8 @@ public abstract class LayoutInflater {













    private static final String TAG = LayoutInflater.class.getSimpleName();















    private static final boolean DEBUG = false;





























    private static final String USE_PRECOMPILED_LAYOUT_SYSTEM_PROPERTY













        = "view.precompiled_layout_enabled";















    private static final String COMPILED_VIEW_DEX_FILE_NAME = "/compiled_view.dex";































    /** Empty stack trace used to avoid log spam in re-throw exceptions. */










@@ -401,19 +400,8 @@ public abstract class LayoutInflater {













    }































    private void initPrecompiledViews() {













        // Use the device config if enabled, otherwise default to the system property.













        String usePrecompiledLayout = DeviceConfig.getProperty(













                DeviceConfig.Runtime.NAMESPACE,













                DeviceConfig.Runtime.USE_PRECOMPILED_LAYOUT);













        boolean enabled = false;













        if (TextUtils.isEmpty(usePrecompiledLayout)) {













            enabled = SystemProperties.getBoolean(













                    DeviceConfig.Runtime.USE_PRECOMPILED_LAYOUT,













                    false);













        } else {













            enabled = Boolean.parseBoolean(usePrecompiledLayout);













        }













        initPrecompiledViews(enabled);













        initPrecompiledViews(













                SystemProperties.getBoolean(USE_PRECOMPILED_LAYOUT_SYSTEM_PROPERTY, false));















    }































    private void initPrecompiledViews(boolean enablePrecompiledViews) {