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

Commit ec7b85d5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Merge android12L-tests-dev@8941410" into android13-tests-dev

parents 307c410f 9cbe662e

cmds/installd/InstalldNativeService.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -2876,6 +2876,9 @@ binder::Status InstalldNativeService::getExternalSize(const std::optional<std::s 
        auto obbPath = StringPrintf("%s/Android/obb",

        auto obbPath = StringPrintf("%s/Android/obb",

                create_data_media_path(uuid_, userId).c_str());

                create_data_media_path(uuid_, userId).c_str());

        calculate_tree_size(obbPath, &obbSize);

        calculate_tree_size(obbPath, &obbSize);

        if (!(flags & FLAG_USE_QUOTA)) {

            totalSize -= obbSize;

        }

        ATRACE_END();

        ATRACE_END();

    }

    }

opengl/tests/gl2_cameraeye/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ 
    <uses-feature android:name="android.hardware.camera.autofocus" />

    <uses-feature android:name="android.hardware.camera.autofocus" />

    <uses-feature android:glEsVersion="0x00020000" />

    <uses-feature android:glEsVersion="0x00020000" />

    <application android:label="@string/gl2cameraeye_name">

    <application android:label="@string/gl2cameraeye_name">

        <activity android:name="GL2CameraEye">

        <activity android:name="GL2CameraEye" android:exported="true">

            <intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.LAUNCHER"/>

                <category android:name="android.intent.category.LAUNCHER"/>

opengl/tests/gl2_java/AndroidManifest.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,8 @@ 
        <activity android:name="GL2JavaActivity"

        <activity android:name="GL2JavaActivity"

                android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

                android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

            	android:launchMode="singleTask"

            	android:launchMode="singleTask"

            	android:configChanges="orientation|keyboardHidden">

		android:configChanges="orientation|keyboardHidden"

		android:exported="true">

            <intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

                <category android:name="android.intent.category.LAUNCHER" />

opengl/tests/gl2_jni/AndroidManifest.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,8 @@ 
        <activity android:name="GL2JNIActivity"

        <activity android:name="GL2JNIActivity"

                android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

                android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

            	android:launchMode="singleTask"

            	android:launchMode="singleTask"

            	android:configChanges="orientation|keyboardHidden">

		android:configChanges="orientation|keyboardHidden"

		android:exported="true">

            <intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

                <category android:name="android.intent.category.LAUNCHER" />

opengl/tests/gl_jni/AndroidManifest.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,8 @@ 
                android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

                android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

            	android:launchMode="singleTask"

            	android:launchMode="singleTask"

            	android:screenOrientation="landscape"

            	android:screenOrientation="landscape"

            	android:configChanges="orientation|keyboardHidden">

		android:configChanges="orientation|keyboardHidden"

		android:exported="true">

            <intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

                <category android:name="android.intent.category.LAUNCHER" />