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

Merge "Update language to comply with Android's inclusive language guidance" am: 6300e98b1f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12295302

Change-Id: I5e68a3ce5fbcd91032d434df7e6a6d1c28ca39f7
This commit is contained in:
TreeHugger Robot
2020-08-04 19:15:13 +00:00
committed by Automerger Merge Worker
parent b83fa7d68a 6300e98b1f
commit 5f08726c1b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/search/SearchFeatureProviderImpl.java
View File

@@ -46,7 +46,7 @@ public class SearchFeatureProviderImpl implements SearchFeatureProvider {
final boolean isSettingsPackage = TextUtils.equals(packageName, context.getPackageName()) final boolean isSettingsPackage = TextUtils.equals(packageName, context.getPackageName())
|| TextUtils.equals(getSettingsIntelligencePkgName(context), packageName); || TextUtils.equals(getSettingsIntelligencePkgName(context), packageName);
final boolean isWhitelistedPackage = final boolean isWhitelistedPackage =
isSignatureWhitelisted(context, caller.getPackageName()); isSignatureAllowlisted(context, caller.getPackageName());
if (isSettingsPackage || isWhitelistedPackage) { if (isSettingsPackage || isWhitelistedPackage) {
return; return;
} }
@@ -69,7 +69,7 @@ public class SearchFeatureProviderImpl implements SearchFeatureProvider {
.putExtra(Intent.EXTRA_REFERRER, buildReferrer(context, pageId)); .putExtra(Intent.EXTRA_REFERRER, buildReferrer(context, pageId));
} }
protected boolean isSignatureWhitelisted(Context context, String callerPackage) { protected boolean isSignatureAllowlisted(Context context, String callerPackage) {
return false; return false;
} }