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

Commit cbf51ff8 authored by Will Leshner's avatar Will Leshner Committed by Android (Google) Code Review
Browse files

Merge "Revert "Guard against a nonexistent dream settings activity."" into main

parents c51b65b7 41a36552

core/java/android/service/dreams/DreamService.java

+7 −20
Original line number Diff line number Diff line
@@ -1389,8 +1389,7 @@ public class DreamService extends Service implements Window.Callback { 
                        convertToComponentName(

                                rawMetadata.getString(

                                        com.android.internal.R.styleable.Dream_settingsActivity),

                                serviceInfo,

                                packageManager),

                                serviceInfo),

                        rawMetadata.getDrawable(

                                com.android.internal.R.styleable.Dream_previewImage),

                        rawMetadata.getBoolean(R.styleable.Dream_showClockAndComplications,
@@ -1405,38 +1404,26 @@ public class DreamService extends Service implements Window.Callback { 
    }



    @Nullable

    private static ComponentName convertToComponentName(

            @Nullable String flattenedString,

            ServiceInfo serviceInfo,

            PackageManager packageManager) {

    private static ComponentName convertToComponentName(@Nullable String flattenedString,

            ServiceInfo serviceInfo) {

        if (flattenedString == null) {

            return null;

        }



        final ComponentName cn =

                flattenedString.contains("/")

                        ? ComponentName.unflattenFromString(flattenedString)

                        : new ComponentName(serviceInfo.packageName, flattenedString);



        if (cn == null) {

            return null;

        if (!flattenedString.contains("/")) {

            return new ComponentName(serviceInfo.packageName, flattenedString);

        }



        // Ensure that the component is from the same package as the dream service. If not,

        // treat the component as invalid and return null instead.

        final ComponentName cn = ComponentName.unflattenFromString(flattenedString);

        if (cn == null) return null;

        if (!cn.getPackageName().equals(serviceInfo.packageName)) {

            Log.w(TAG,

                    "Inconsistent package name in component: " + cn.getPackageName()

                            + ", should be: " + serviceInfo.packageName);

            return null;

        }



        // Ensure that the activity exists. If not, treat the component as invalid and return null.

        if (new Intent().setComponent(cn).resolveActivityInfo(packageManager, 0) == null) {

            Log.w(TAG, "Dream settings activity not found: " + cn);

            return null;

        }



        return cn;

    }

services/tests/dreamservicetests/AndroidManifest.xml

+0 −29
Original line number Diff line number Diff line
@@ -53,35 +53,6 @@ 
                android:name="android.service.dream"

                android:resource="@xml/test_dream_metadata_invalid" />

        </service>



        <service

            android:name="com.android.server.dreams.TestDreamServiceWithNonexistentSettings"

            android:exported="false"

            android:label="Test Dream" >

            <intent-filter>

                <action android:name="android.service.dreams.DreamService" />

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

            </intent-filter>

            <meta-data

                android:name="android.service.dream"

                android:resource="@xml/test_dream_metadata_nonexistent_settings" />

        </service>



        <service

            android:name="com.android.server.dreams.TestDreamServiceNoPackageNonexistentSettings"

            android:exported="false"

            android:label="Test Dream" >

            <intent-filter>

                <action android:name="android.service.dreams.DreamService" />

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

            </intent-filter>

            <meta-data

                android:name="android.service.dream"

                android:resource="@xml/test_dream_metadata_nopackage_nonexistent_settings" />

        </service>



        <activity android:name=".TestDreamSettingsActivity">

        </activity>

    </application>



    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

services/tests/dreamservicetests/res/xml/test_dream_metadata_nonexistent_settings.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2024 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<!-- The settings activity does not exist, which is invalid. -->

<dream xmlns:android="http://schemas.android.com/apk/res/android"

    android:settingsActivity="com.android.frameworks.dreamservicetests/.TestDreamSettingsActivity2"

    android:showClockAndComplications="false"/>

services/tests/dreamservicetests/res/xml/test_dream_metadata_nopackage_nonexistent_settings.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2024 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<!-- The settings activity does not exist, which is invalid. -->

<dream xmlns:android="http://schemas.android.com/apk/res/android"

    android:settingsActivity="com.android.frameworks.dreamservicetests.TestDreamSettingsActivity2"

    android:showClockAndComplications="false"/>

services/tests/dreamservicetests/src/com/android/server/dreams/DreamServiceTest.java

+0 −22
Original line number Diff line number Diff line
@@ -90,28 +90,6 @@ public class DreamServiceTest { 
        assertThat(metadata.dreamCategory).isEqualTo(DreamService.DREAM_CATEGORY_DEFAULT);

    }



    @Test

    public void testMetadataParsing_nonexistentSettingsActivity()

            throws PackageManager.NameNotFoundException {

        final String testDreamClassName =

                "com.android.server.dreams.TestDreamServiceWithNonexistentSettings";

        final DreamService.DreamMetadata metadata = getDreamMetadata(testDreamClassName);



        assertThat(metadata.settingsActivity).isNull();

        assertThat(metadata.dreamCategory).isEqualTo(DreamService.DREAM_CATEGORY_DEFAULT);

    }



    @Test

    public void testMetadataParsing_noPackage_nonexistentSettingsActivity()

            throws PackageManager.NameNotFoundException {

        final String testDreamClassName =

                "com.android.server.dreams.TestDreamServiceNoPackageNonexistentSettings";

        final DreamService.DreamMetadata metadata = getDreamMetadata(testDreamClassName);



        assertThat(metadata.settingsActivity).isNull();

        assertThat(metadata.dreamCategory).isEqualTo(DreamService.DREAM_CATEGORY_DEFAULT);

    }



    @Test

    public void testMetadataParsing_exceptionReading() {

        final PackageManager packageManager = Mockito.mock(PackageManager.class);