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

Commit ea5dbf68 authored by Jason Chiu's avatar Jason Chiu Committed by Android (Google) Code Review
Browse files

Merge "[Safer intents] Device info" into main

parents f52d24e7 2dc76ee9

res/xml/my_device_info.xml

+4 −2
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ 
            android:key="regulatory_info"

            android:order="16"

            android:title="@string/regulatory_labels">

            <intent android:action="android.settings.SHOW_REGULATORY_INFO"/>

            <intent android:action="android.settings.SHOW_REGULATORY_INFO"

                    android:targetPackage="${applicationId}"/>

        </Preference>



        <!-- Safety & regulatory manual -->
@@ -207,7 +208,8 @@ 
            android:key="manual"

            android:order="50"

            android:title="@string/manual">

            <intent android:action="android.settings.SHOW_MANUAL"/>

            <intent android:action="android.settings.SHOW_MANUAL"

                    android:targetPackage="${applicationId}"/>

        </Preference>



        <!-- Feedback on the device -->

src/com/android/settings/deviceinfo/SafetyInfoPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ public class SafetyInfoPreferenceController extends AbstractPreferenceController 
        PreferenceControllerMixin {



    private static final Intent INTENT_PROBE =

            new Intent("android.settings.SHOW_SAFETY_AND_REGULATORY_INFO");

            new Intent("android.settings.SHOW_SAFETY_AND_REGULATORY_INFO")

                    .setPackage("com.android.safetyregulatoryinfo");



    private final PackageManager mPackageManager;

src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java

+3 −2
Original line number Diff line number Diff line
@@ -27,11 +27,11 @@ import android.os.Handler; 
import android.os.storage.DiskInfo;

import android.util.Log;

import android.view.View;

import android.view.WindowManager;

import android.widget.Toast;



import com.android.settings.R;



import android.view.WindowManager;

import com.android.settings.Utils;



public class StorageWizardMigrateProgress extends StorageWizardBase {

    private static final String TAG = "StorageWizardMigrateProgress";
@@ -83,6 +83,7 @@ public class StorageWizardMigrateProgress extends StorageWizardBase { 
                        // Kinda lame, but tear down that shiny finished

                        // notification, since user is still in wizard flow

                        final Intent finishIntent = new Intent(ACTION_FINISH_WIZARD);

                        finishIntent.setPackage(Utils.SYSTEMUI_PACKAGE_NAME);

                        finishIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);

                        sendBroadcast(finishIntent);