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

Gracefully handle system error from AppSearch

Browse Source 
In rare scenario, if AppSearchSession was invoked after user is locked,
the call will fail which currently resulted in a crash in system
process. This CL includes the logic to prevent such scenario from
crashing the system process.

Bug: 221110670
Test: manual
Change-Id: I668e34781f70ceb54bb87839412abc1bc04c0d3d
This commit is contained in:
Pinyao Ting
2022-03-17 00:47:15 +00:00
parent 8b50a56841
commit 05ec3573fc
1 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
services/core/java/com/android/server/pm/ShortcutPackage.java
View File

@@ -19,9 +19,12 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.app.Person;
import android.app.appsearch.AppSearchBatchResult;
import android.app.appsearch.AppSearchManager;
import android.app.appsearch.AppSearchResult;
import android.app.appsearch.AppSearchSession;
import android.app.appsearch.BatchResultCallback;
import android.app.appsearch.GenericDocument;
import android.app.appsearch.GetByDocumentIdRequest;
import android.app.appsearch.PackageIdentifier;
import android.app.appsearch.PutDocumentsRequest;
@@ -2384,14 +2387,24 @@ class ShortcutPackage extends ShortcutPackageItem {
}
runAsSystem(() -> fromAppSearch().thenAccept(session -> {
session.getByDocumentId(new GetByDocumentIdRequest.Builder(getPackageName())
.addIds(ids).build(), mShortcutUser.mExecutor, result -> {
final List<ShortcutInfo> ret = result.getSuccesses().values()
.stream().map(doc ->
ShortcutInfo.createFromGenericDocument(
mShortcutUser.getUserId(), doc))
.collect(Collectors.toList());
cb.accept(ret);
});
.addIds(ids).build(), mShortcutUser.mExecutor,
new BatchResultCallback<String, GenericDocument>() {
@Override
public void onResult(
@NonNull AppSearchBatchResult<String, GenericDocument> result) {
final List<ShortcutInfo> ret = result.getSuccesses().values()
.stream().map(doc ->
ShortcutInfo.createFromGenericDocument(
mShortcutUser.getUserId(), doc))
.collect(Collectors.toList());
cb.accept(ret);
}
@Override
public void onSystemError(
@Nullable Throwable throwable) {
Slog.d(TAG, "Error retrieving shortcuts", throwable);
}
});
}));
}
@@ -2407,15 +2420,24 @@ class ShortcutPackage extends ShortcutPackageItem {
runAsSystem(() -> fromAppSearch().thenAccept(session ->
session.remove(
new RemoveByDocumentIdRequest.Builder(getPackageName()).addIds(ids).build(),
mShortcutUser.mExecutor, result -> {
if (!result.isSuccess()) {
final Map<String, AppSearchResult<Void>> failures =
result.getFailures();
for (String key : failures.keySet()) {
Slog.e(TAG, "Failed deleting " + key + ", error message:"
+ failures.get(key).getErrorMessage());
mShortcutUser.mExecutor,
new BatchResultCallback<String, Void>() {
@Override
public void onResult(
@NonNull AppSearchBatchResult<String, Void> result) {
if (!result.isSuccess()) {
final Map<String, AppSearchResult<Void>> failures =
result.getFailures();
for (String key : failures.keySet()) {
Slog.e(TAG, "Failed deleting " + key + ", error message:"
+ failures.get(key).getErrorMessage());
}
}
}
@Override
public void onSystemError(@Nullable Throwable throwable) {
Slog.e(TAG, "Error removing shortcuts", throwable);
}
})));
}
@@ -2452,12 +2474,20 @@ class ShortcutPackage extends ShortcutPackageItem {
AppSearchShortcutInfo.toGenericDocuments(shortcuts))
.build(),
mShortcutUser.mExecutor,
result -> {
if (!result.isSuccess()) {
for (AppSearchResult<Void> k : result.getFailures().values()) {
Slog.e(TAG, k.getErrorMessage());
new BatchResultCallback<String, Void>() {
@Override
public void onResult(
@NonNull AppSearchBatchResult<String, Void> result) {
if (!result.isSuccess()) {
for (AppSearchResult<Void> k : result.getFailures().values()) {
Slog.e(TAG, k.getErrorMessage());
}
}
}
@Override
public void onSystemError(@Nullable Throwable throwable) {
Slog.d(TAG, "Error persisting shortcuts", throwable);
}
});
}));
}