Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Fix regulatory info availability check

Browse Source 
queryIntentActivities will return something even if the activity is disabled
directly check the flag that controls the enablement

Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
This commit is contained in:
Ido Ben-Hur
2024-05-01 12:21:19 +03:00
committed by Joey
parent ac0dfd3030
commit 30f778eacd
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceController.java
View File

@@ -16,9 +16,8 @@
package com.android.settings.deviceinfo; package com.android.settings.deviceinfo;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
@@ -26,7 +25,6 @@ public class RegulatoryInfoPreferenceController extends AbstractPreferenceContro
PreferenceControllerMixin { PreferenceControllerMixin {
private static final String KEY_REGULATORY_INFO = "regulatory_info"; private static final String KEY_REGULATORY_INFO = "regulatory_info";
private static final Intent INTENT_PROBE = new Intent(Settings.ACTION_SHOW_REGULATORY_INFO);
public RegulatoryInfoPreferenceController(Context context) { public RegulatoryInfoPreferenceController(Context context) {
super(context); super(context);
@@ -34,7 +32,7 @@ public class RegulatoryInfoPreferenceController extends AbstractPreferenceContro
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return !mContext.getPackageManager().queryIntentActivities(INTENT_PROBE, 0).isEmpty(); return mContext.getResources().getBoolean(R.bool.config_show_regulatory_info);
} }
@Override @Override