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

Commit 97c1356a authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Gerrit Code Review
Browse files

Merge "Merge "Merge "opengl: tests: Add explict android:exported flag to... 

Merge "Merge "Merge "opengl: tests: Add explict android:exported flag to manifests" into android12-tests-dev am: d59857ef" into android12L-tests-dev am: 5825d17d"
parents c464a41d b53174fc

opengl/tests/gl2_cameraeye/AndroidManifest.xml

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

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

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

        <activity android:name="GL2CameraEye">

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

            <intent-filter>

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

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

opengl/tests/gl2_java/AndroidManifest.xml

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

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

            	android:launchMode="singleTask"

            	android:configChanges="orientation|keyboardHidden">

		android:configChanges="orientation|keyboardHidden"

		android:exported="true">

            <intent-filter>

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

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

opengl/tests/gl2_jni/AndroidManifest.xml

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

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

            	android:launchMode="singleTask"

            	android:configChanges="orientation|keyboardHidden">

		android:configChanges="orientation|keyboardHidden"

		android:exported="true">

            <intent-filter>

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

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

opengl/tests/gl_jni/AndroidManifest.xml

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

            	android:launchMode="singleTask"

            	android:screenOrientation="landscape"

            	android:configChanges="orientation|keyboardHidden">

		android:configChanges="orientation|keyboardHidden"

		android:exported="true">

            <intent-filter>

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

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

opengl/tests/lighting1709/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
        package="com.android.lightingtest">



    <application>

        <activity android:name="ClearActivity" android:label="LightingTest">

        <activity android:name="ClearActivity" android:label="LightingTest" android:exported="true">

            <intent-filter>

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

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