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

Commit 7b23fdc3 authored by Luca Stefani's avatar Luca Stefani
Browse files

Merge remote-tracking branch 'aosp/pie-gsi' into lineage-16.0-gsi 

* aosp/pie-gsi:
  Reduce screen layout in task override configuration from its parent config
  Allow all system configs in /product

Change-Id: I2c04bc83eba769fa1344bca46adcb21b9797bd28
parents 8a54ade4 264d2cfe

core/java/com/android/server/SystemConfig.java

+3 −5
Original line number Diff line number Diff line
@@ -319,13 +319,11 @@ public class SystemConfig { 
        readPermissions(Environment.buildPath(

                Environment.getOemDirectory(), "etc", "permissions"), oemPermissionFlag);



        // Allow Product to customize system configs around libs, features, permissions and apps

        int productPermissionFlag = ALLOW_LIBS | ALLOW_FEATURES | ALLOW_PERMISSIONS |

                ALLOW_APP_CONFIGS | ALLOW_PRIVAPP_PERMISSIONS;

        // Allow Product to customize all system configs

        readPermissions(Environment.buildPath(

                Environment.getProductDirectory(), "etc", "sysconfig"), productPermissionFlag);

                Environment.getProductDirectory(), "etc", "sysconfig"), ALLOW_ALL);

        readPermissions(Environment.buildPath(

                Environment.getProductDirectory(), "etc", "permissions"), productPermissionFlag);

                Environment.getProductDirectory(), "etc", "permissions"), ALLOW_ALL);

    }



    void readPermissions(File libraryDir, int permissionFlag) {

services/core/java/com/android/server/am/TaskRecord.java

+3 −1
Original line number Diff line number Diff line
@@ -1839,7 +1839,9 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi 
        final int compatScreenHeightDp = (int) (mTmpNonDecorBounds.height() / density);

        // We're only overriding LONG, SIZE and COMPAT parts of screenLayout, so we start override

        // calculation with partial default.

        final int sl = Configuration.SCREENLAYOUT_LONG_YES | Configuration.SCREENLAYOUT_SIZE_XLARGE;

        // Reducing the screen layout starting from its parent config.

        final int sl = parentConfig.screenLayout &

                (Configuration.SCREENLAYOUT_LONG_MASK | Configuration.SCREENLAYOUT_SIZE_MASK);

        final int longSize = Math.max(compatScreenHeightDp, compatScreenWidthDp);

        final int shortSize = Math.min(compatScreenHeightDp, compatScreenWidthDp);

        config.screenLayout = Configuration.reduceScreenLayout(sl, longSize, shortSize);