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

Merge "Allow caller holding BIND_CONTENT_SUGGESTIONS_SERVICE to make suggestion calls" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-19 19:31:37 +00:00
committed by Android (Google) Code Review
parent 5c06f8cecb 7991b85da5
commit 83f228f6cd
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
services/contentsuggestions/java/com/android/server/contentsuggestions/ContentSuggestionsManagerService.java
View File

@@ -16,7 +16,9 @@
package com.android.server.contentsuggestions; package com.android.server.contentsuggestions;
import static android.Manifest.permission.BIND_CONTENT_SUGGESTIONS_SERVICE;
import static android.Manifest.permission.MANAGE_CONTENT_SUGGESTIONS; import static android.Manifest.permission.MANAGE_CONTENT_SUGGESTIONS;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
@@ -92,16 +94,11 @@ public class ContentSuggestionsManagerService extends
return MAX_TEMP_SERVICE_DURATION_MS; return MAX_TEMP_SERVICE_DURATION_MS;
} }
private boolean isCallerRecents(int userId) { private void enforceCaller(int userId, String func) {
if (mServiceNameResolver.isTemporary(userId)) { Context ctx = getContext();
// If a temporary service is set then skip the recents check if (ctx.checkCallingPermission(BIND_CONTENT_SUGGESTIONS_SERVICE) == PERMISSION_GRANTED
return true; || mServiceNameResolver.isTemporary(userId)
} || mActivityTaskManagerInternal.isCallerRecents(Binder.getCallingUid())) {
return mActivityTaskManagerInternal.isCallerRecents(Binder.getCallingUid());
}
private void enforceCallerIsRecents(int userId, String func) {
if (isCallerRecents(userId)) {
return; return;
} }
@@ -122,7 +119,7 @@ public class ContentSuggestionsManagerService extends
if (imageContextRequestExtras == null) { if (imageContextRequestExtras == null) {
throw new IllegalArgumentException("Expected non-null imageContextRequestExtras"); throw new IllegalArgumentException("Expected non-null imageContextRequestExtras");
} }
enforceCallerIsRecents(UserHandle.getCallingUserId(), "provideContextImage"); enforceCaller(UserHandle.getCallingUserId(), "provideContextImage");
synchronized (mLock) { synchronized (mLock) {
final ContentSuggestionsPerUserService service = getServiceForUserLocked(userId); final ContentSuggestionsPerUserService service = getServiceForUserLocked(userId);
@@ -141,7 +138,7 @@ public class ContentSuggestionsManagerService extends
int userId, int userId,
@NonNull SelectionsRequest selectionsRequest, @NonNull SelectionsRequest selectionsRequest,
@NonNull ISelectionsCallback selectionsCallback) { @NonNull ISelectionsCallback selectionsCallback) {
enforceCallerIsRecents(UserHandle.getCallingUserId(), "suggestContentSelections"); enforceCaller(UserHandle.getCallingUserId(), "suggestContentSelections");
synchronized (mLock) { synchronized (mLock) {
final ContentSuggestionsPerUserService service = getServiceForUserLocked(userId); final ContentSuggestionsPerUserService service = getServiceForUserLocked(userId);
@@ -160,7 +157,7 @@ public class ContentSuggestionsManagerService extends
int userId, int userId,
@NonNull ClassificationsRequest classificationsRequest, @NonNull ClassificationsRequest classificationsRequest,
@NonNull IClassificationsCallback callback) { @NonNull IClassificationsCallback callback) {
enforceCallerIsRecents(UserHandle.getCallingUserId(), "classifyContentSelections"); enforceCaller(UserHandle.getCallingUserId(), "classifyContentSelections");
synchronized (mLock) { synchronized (mLock) {
final ContentSuggestionsPerUserService service = getServiceForUserLocked(userId); final ContentSuggestionsPerUserService service = getServiceForUserLocked(userId);
@@ -177,7 +174,7 @@ public class ContentSuggestionsManagerService extends
@Override @Override
public void notifyInteraction( public void notifyInteraction(
int userId, @NonNull String requestId, @NonNull Bundle bundle) { int userId, @NonNull String requestId, @NonNull Bundle bundle) {
enforceCallerIsRecents(UserHandle.getCallingUserId(), "notifyInteraction"); enforceCaller(UserHandle.getCallingUserId(), "notifyInteraction");
synchronized (mLock) { synchronized (mLock) {
final ContentSuggestionsPerUserService service = getServiceForUserLocked(userId); final ContentSuggestionsPerUserService service = getServiceForUserLocked(userId);
@@ -194,7 +191,7 @@ public class ContentSuggestionsManagerService extends
@Override @Override
public void isEnabled(int userId, @NonNull IResultReceiver receiver) public void isEnabled(int userId, @NonNull IResultReceiver receiver)
throws RemoteException { throws RemoteException {
enforceCallerIsRecents(UserHandle.getCallingUserId(), "isEnabled"); enforceCaller(UserHandle.getCallingUserId(), "isEnabled");
boolean isDisabled; boolean isDisabled;
synchronized (mLock) { synchronized (mLock) {