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

Settings: Properly handle ASI and WallpaperPreference for gms and vanilla builds

Browse Source 
Signed-off-by: minaripenguin <minaripenguin@users.noreply.github.com>
This commit is contained in:
minaripenguin
2024-04-24 06:50:55 +08:00
committed by Joey
parent fb08c30d9b
commit 5154710c9b
7 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/Utils.java
View File

@@ -1286,6 +1286,15 @@ public final class Utils extends com.android.settingslib.Utils {
return false;
}
public static String getAsiPackage(Context context) {
final boolean isGoogleAsiInstalled = com.android.internal.util.evolution.Utils.isPackageInstalled(context,
context.getString(R.string.config_google_settingsintelligence_package_name));
final String settingsIntelligencePkg = context.getString(isGoogleAsiInstalled
? R.string.config_google_settingsintelligence_package_name
: R.string.config_settingsintelligence_package_name);
return settingsIntelligencePkg;
}
/**
* Returns true if current binder uid is Settings Intelligence.
*/
@@ -1293,7 +1302,7 @@ public final class Utils extends com.android.settingslib.Utils {
final int callingUid = Binder.getCallingUid();
final String callingPackage = context.getPackageManager().getPackagesForUid(callingUid)[0];
final boolean isSettingsIntelligence = TextUtils.equals(callingPackage,
context.getString(R.string.config_settingsintelligence_package_name));
getAsiPackage(context));
return isSettingsIntelligence;
}