Allow SettingsIntelligence to access SearchResultTrampoline

Bug: 64938328
Test: robotests
Change-Id: I89b0b8adf1e034f0fc57a3991fb56452a7210219
This commit is contained in:
Fan Zhang
2017-11-13 13:22:42 -08:00
parent 7020d97545
commit 439921345a
3 changed files with 24 additions and 14 deletions

View File

@@ -40,16 +40,10 @@ public class SearchFeatureProviderImpl implements SearchFeatureProvider {
private static final String TAG = "SearchFeatureProvider";
private static final String METRICS_ACTION_SETTINGS_INDEX = "search_synchronous_indexing";
private DatabaseIndexingManager mDatabaseIndexingManager;
private SiteMapManager mSiteMapManager;
private ExecutorService mExecutorService;
@Override
public boolean isEnabled(Context context) {
return true;
}
@Override
public void verifyLaunchSearchResultPageCaller(Context context, ComponentName caller) {
if (caller == null) {
@@ -57,9 +51,15 @@ public class SearchFeatureProviderImpl implements SearchFeatureProvider {
+ "must be called with startActivityForResult");
}
final String packageName = caller.getPackageName();
if (!TextUtils.equals(packageName, context.getPackageName())) {
throw new SecurityException("Only Settings app can launch search result page");
final boolean isSettingsPackage = TextUtils.equals(packageName, context.getPackageName())
|| TextUtils.equals(getSettingsIntelligencePkgName(), packageName);
final boolean isWhitelistedPackage =
isSignatureWhitelisted(context, caller.getPackageName());
if (isSettingsPackage || isWhitelistedPackage) {
return;
}
throw new SecurityException("Search result intents must be called with from a "
+ "whitelisted package.");
}
@Override
@@ -141,6 +141,14 @@ public class SearchFeatureProviderImpl implements SearchFeatureProvider {
return mExecutorService;
}
protected boolean isSignatureWhitelisted(Context context, String callerPackage) {
return false;
}
protected String getSettingsIntelligencePkgName() {
return "com.android.settings.intelligence";
}
/**
* A generic method to make the query suitable for searching the database.
*