mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-14 18:34:30 -05:00
141 lines
6.9 KiB
Diff
141 lines
6.9 KiB
Diff
From 814483f2eee226ee461cea6685325b6f0b04748f Mon Sep 17 00:00:00 2001
|
|
From: Jason Chiu <chiujason@google.com>
|
|
Date: Wed, 31 Jan 2024 16:29:01 +0800
|
|
Subject: [PATCH] Replace getCallingActivity() with getLaunchedFromPackage()
|
|
|
|
getLaunchedFromPackage() reports who launched this Activity or built
|
|
PendingIntent used to launch it, whereas getCallingActivity() reports
|
|
who will get result of Activity.
|
|
|
|
Bug: 316891059
|
|
Test: robotest, manual
|
|
(cherry picked from commit ddc11bc03ab48e885f652b89df5f92ff283bcd4a)
|
|
(cherry picked from commit 8bdbb580da847d82f16fb57883a01a5e65ffa696)
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c7a8127d3bb6010617e507c03f7207dd50082953)
|
|
Merged-In: If97018c2741caef622f0596bbfeaa42ef1788b78
|
|
Change-Id: If97018c2741caef622f0596bbfeaa42ef1788b78
|
|
---
|
|
.../search/SearchFeatureProvider.java | 2 +-
|
|
.../search/SearchFeatureProviderImpl.java | 20 +++++++++----------
|
|
.../search/SearchResultTrampoline.java | 2 +-
|
|
.../search/SearchFeatureProviderImplTest.java | 15 +++++++-------
|
|
4 files changed, 19 insertions(+), 20 deletions(-)
|
|
|
|
diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java
|
|
index cbe49f8c799..9bfd5460efa 100644
|
|
--- a/src/com/android/settings/search/SearchFeatureProvider.java
|
|
+++ b/src/com/android/settings/search/SearchFeatureProvider.java
|
|
@@ -38,7 +38,7 @@ public interface SearchFeatureProvider {
|
|
* @throws IllegalArgumentException when caller is null
|
|
* @throws SecurityException when caller is not allowed to launch search result page
|
|
*/
|
|
- void verifyLaunchSearchResultPageCaller(Context context, @NonNull ComponentName caller)
|
|
+ void verifyLaunchSearchResultPageCaller(@NonNull Context context, @NonNull String callerPackage)
|
|
throws SecurityException, IllegalArgumentException;
|
|
|
|
/**
|
|
diff --git a/src/com/android/settings/search/SearchFeatureProviderImpl.java b/src/com/android/settings/search/SearchFeatureProviderImpl.java
|
|
index 78c47edf046..7c88785b337 100644
|
|
--- a/src/com/android/settings/search/SearchFeatureProviderImpl.java
|
|
+++ b/src/com/android/settings/search/SearchFeatureProviderImpl.java
|
|
@@ -17,10 +17,11 @@
|
|
|
|
package com.android.settings.search;
|
|
|
|
-import android.content.ComponentName;
|
|
import android.content.Context;
|
|
import android.text.TextUtils;
|
|
|
|
+import android.annotation.NonNull;
|
|
+
|
|
import com.android.internal.annotations.VisibleForTesting;
|
|
import com.android.settings.overlay.FeatureFactory;
|
|
import com.android.settings.search.indexing.IndexData;
|
|
@@ -32,24 +33,21 @@
|
|
*/
|
|
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 SearchIndexableResources mSearchIndexableResources;
|
|
|
|
@Override
|
|
- public void verifyLaunchSearchResultPageCaller(Context context, ComponentName caller) {
|
|
- if (caller == null) {
|
|
+ public void verifyLaunchSearchResultPageCaller(@NonNull Context context,
|
|
+ @NonNull String callerPackage) {
|
|
+ if (TextUtils.isEmpty(callerPackage)) {
|
|
throw new IllegalArgumentException("ExternalSettingsTrampoline intents "
|
|
+ "must be called with startActivityForResult");
|
|
}
|
|
- final String packageName = caller.getPackageName();
|
|
- final boolean isSettingsPackage = TextUtils.equals(packageName, context.getPackageName())
|
|
- || TextUtils.equals(getSettingsIntelligencePkgName(), packageName);
|
|
- final boolean isWhitelistedPackage =
|
|
- isSignatureWhitelisted(context, caller.getPackageName());
|
|
- if (isSettingsPackage || isWhitelistedPackage) {
|
|
+ final boolean isSettingsPackage = TextUtils.equals(callerPackage, context.getPackageName())
|
|
+ || TextUtils.equals(getSettingsIntelligencePkgName(), callerPackage);
|
|
+ final boolean isAllowlistedPackage = isSignatureWhitelisted(context, callerPackage);
|
|
+ if (isSettingsPackage || isAllowlistedPackage) {
|
|
return;
|
|
}
|
|
throw new SecurityException("Search result intents must be called with from a "
|
|
diff --git a/src/com/android/settings/search/SearchResultTrampoline.java b/src/com/android/settings/search/SearchResultTrampoline.java
|
|
index 3bbe6bd58a7..70387b021d4 100644
|
|
--- a/src/com/android/settings/search/SearchResultTrampoline.java
|
|
+++ b/src/com/android/settings/search/SearchResultTrampoline.java
|
|
@@ -38,7 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
|
|
// First make sure caller has privilege to launch a search result page.
|
|
FeatureFactory.getFactory(this)
|
|
.getSearchFeatureProvider()
|
|
- .verifyLaunchSearchResultPageCaller(this, getCallingActivity());
|
|
+ .verifyLaunchSearchResultPageCaller(this, getCallingPackage());
|
|
// Didn't crash, proceed and launch the result as a subsetting.
|
|
final Intent intent = getIntent();
|
|
|
|
diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
|
|
index eeebdee96e3..7945c05a293 100644
|
|
--- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
|
|
+++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
|
|
@@ -21,7 +21,6 @@
|
|
import static org.mockito.Mockito.spy;
|
|
|
|
import android.app.Activity;
|
|
-import android.content.ComponentName;
|
|
import android.content.Intent;
|
|
import android.widget.Toolbar;
|
|
|
|
@@ -70,21 +69,23 @@ public void verifyLaunchSearchResultPageCaller_nullCaller_shouldCrash() {
|
|
|
|
@Test(expected = SecurityException.class)
|
|
public void verifyLaunchSearchResultPageCaller_badCaller_shouldCrash() {
|
|
- final ComponentName cn = new ComponentName("pkg", "class");
|
|
- mProvider.verifyLaunchSearchResultPageCaller(mActivity, cn);
|
|
+ final String packageName = "pkg";
|
|
+
|
|
+ mProvider.verifyLaunchSearchResultPageCaller(mActivity, packageName);
|
|
}
|
|
|
|
@Test
|
|
public void verifyLaunchSearchResultPageCaller_settingsCaller_shouldNotCrash() {
|
|
- final ComponentName cn = new ComponentName(mActivity.getPackageName(), "class");
|
|
- mProvider.verifyLaunchSearchResultPageCaller(mActivity, cn);
|
|
+ final String packageName = mActivity.getPackageName();
|
|
+
|
|
+ mProvider.verifyLaunchSearchResultPageCaller(mActivity, packageName);
|
|
}
|
|
|
|
@Test
|
|
public void verifyLaunchSearchResultPageCaller_settingsIntelligenceCaller_shouldNotCrash() {
|
|
final String packageName = mProvider.getSettingsIntelligencePkgName();
|
|
- final ComponentName cn = new ComponentName(packageName, "class");
|
|
- mProvider.verifyLaunchSearchResultPageCaller(mActivity, cn);
|
|
+
|
|
+ mProvider.verifyLaunchSearchResultPageCaller(mActivity, packageName);
|
|
}
|
|
|
|
@Test
|