PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Safer intents] Device info

Browse Source 
To avoid implicit intents, make intents launch explicitly.

Bug: 323061508
Test: build
Change-Id: I053372e15f6353578b7646e17f0a8205728945be
This commit is contained in:
Jason Chiu
2024-03-25 15:39:44 +08:00
parent 67bfb4141f
commit 2dc76ee9fe
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/my_device_info.xml
View File

@@ -78,7 +78,8 @@
android:key="regulatory_info" android:key="regulatory_info"
android:order="16" android:order="16"
android:title="@string/regulatory_labels"> 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> </Preference>
<!-- Safety & regulatory manual --> <!-- Safety & regulatory manual -->
@@ -207,7 +208,8 @@
android:key="manual" android:key="manual"
android:order="50" android:order="50"
android:title="@string/manual"> android:title="@string/manual">
<intent android:action="android.settings.SHOW_MANUAL"/> <intent android:action="android.settings.SHOW_MANUAL"
android:targetPackage="${applicationId}"/>
</Preference> </Preference>
<!-- Feedback on the device --> <!-- Feedback on the device -->

3
src/com/android/settings/deviceinfo/SafetyInfoPreferenceController.java
View File

@@ -29,7 +29,8 @@ public class SafetyInfoPreferenceController extends AbstractPreferenceController
PreferenceControllerMixin { PreferenceControllerMixin {
private static final Intent INTENT_PROBE = 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; private final PackageManager mPackageManager;

5
src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java
View File

@@ -27,11 +27,11 @@ import android.os.Handler;
import android.os.storage.DiskInfo; import android.os.storage.DiskInfo;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.view.WindowManager;
import android.widget.Toast; import android.widget.Toast;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils;
import android.view.WindowManager;
public class StorageWizardMigrateProgress extends StorageWizardBase { public class StorageWizardMigrateProgress extends StorageWizardBase {
private static final String TAG = "StorageWizardMigrateProgress"; private static final String TAG = "StorageWizardMigrateProgress";
@@ -83,6 +83,7 @@ public class StorageWizardMigrateProgress extends StorageWizardBase {
// Kinda lame, but tear down that shiny finished // Kinda lame, but tear down that shiny finished
// notification, since user is still in wizard flow // notification, since user is still in wizard flow
final Intent finishIntent = new Intent(ACTION_FINISH_WIZARD); final Intent finishIntent = new Intent(ACTION_FINISH_WIZARD);
finishIntent.setPackage(Utils.SYSTEMUI_PACKAGE_NAME);
finishIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); finishIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
sendBroadcast(finishIntent); sendBroadcast(finishIntent);