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

Merge "Switch over RemoteCallbackList to handle callbacks." into sc-dev am: 6bd3e2ad64

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13882006

Change-Id: I09ac25e54d34a4542b98f99a811892ebea5e8086
This commit is contained in:
TreeHugger Robot
2021-03-18 23:45:19 +00:00
committed by Automerger Merge Worker
parent 5d3b5f70c7 6bd3e2ad64
commit ed22bb1049
1 changed files with 16 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java
View File

@@ -58,6 +58,7 @@ import android.os.Handler;
import android.os.IBinder;
import android.os.Looper;
import android.os.ParcelFileDescriptor;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.os.ResultReceiver;
import android.os.ShellCallback;
@@ -69,7 +70,6 @@ import android.provider.Settings;
import android.service.contentcapture.ActivityEvent.ActivityEventType;
import android.service.contentcapture.IDataShareCallback;
import android.service.contentcapture.IDataShareReadAdapter;
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.LocalLog;
import android.util.Pair;
@@ -174,6 +174,9 @@ public final class ContentCaptureManagerService extends
@GuardedBy("mLock")
private final Set<String> mPackagesWithShareRequests = new HashSet<>();
private final RemoteCallbackList<IContentCaptureOptionsCallback> mCallbacks =
new RemoteCallbackList<>();
final GlobalContentCaptureOptions mGlobalContentCaptureOptions =
new GlobalContentCaptureOptions();
@@ -497,16 +500,15 @@ public final class ContentCaptureManagerService extends
}
void updateOptions(String packageName, ContentCaptureOptions options) {
ArraySet<CallbackRecord> records;
synchronized (mLock) {
records = mContentCaptureManagerServiceStub.mCallbacks.get(packageName);
if (records != null) {
int N = records.size();
for (int i = 0; i < N; i++) {
records.valueAt(i).setContentCaptureOptions(options);
mCallbacks.broadcast((callback, pkg) -> {
if (pkg.equals(packageName)) {
try {
callback.setContentCaptureOptions(options);
} catch (RemoteException e) {
Slog.w(TAG, "Unable to send setContentCaptureOptions(): " + e);
}
}
}
});
}
private ActivityManagerInternal getAmInternal() {
@@ -616,8 +618,6 @@ public final class ContentCaptureManagerService extends
}
final class ContentCaptureManagerServiceStub extends IContentCaptureManager.Stub {
@GuardedBy("mLock")
private final ArrayMap<String, ArraySet<CallbackRecord>> mCallbacks = new ArrayMap<>();
@Override
public void startSession(@NonNull IBinder activityToken,
@@ -778,39 +778,19 @@ public final class ContentCaptureManagerService extends
IContentCaptureOptionsCallback callback) {
assertCalledByPackageOwner(packageName);
CallbackRecord record = new CallbackRecord(callback, packageName);
record.registerObserver();
synchronized (mLock) {
ArraySet<CallbackRecord> records = mCallbacks.get(packageName);
if (records == null) {
records = new ArraySet<>();
}
records.add(record);
mCallbacks.put(packageName, records);
}
mCallbacks.register(callback, packageName);
// Set options here in case it was updated before this was registered.
final int userId = UserHandle.getCallingUserId();
final ContentCaptureOptions options = mGlobalContentCaptureOptions.getOptions(userId,
packageName);
if (options != null) {
record.setContentCaptureOptions(options);
}
}
private void unregisterContentCaptureOptionsCallback(CallbackRecord record) {
synchronized (mLock) {
ArraySet<CallbackRecord> records = mCallbacks.get(record.mPackageName);
if (records != null) {
records.remove(record);
}
if (records == null || records.isEmpty()) {
mCallbacks.remove(record.mPackageName);
try {
callback.setContentCaptureOptions(options);
} catch (RemoteException e) {
Slog.w(TAG, "Unable to send setContentCaptureOptions(): " + e);
}
}
record.unregisterObserver();
}
@Override
@@ -1277,39 +1257,4 @@ public final class ContentCaptureManagerService extends
mDataShareRequest.getPackageName());
}
}
private final class CallbackRecord implements IBinder.DeathRecipient {
private final String mPackageName;
private final IContentCaptureOptionsCallback mCallback;
private CallbackRecord(IContentCaptureOptionsCallback callback, String packageName) {
mCallback = callback;
mPackageName = packageName;
}
private void setContentCaptureOptions(ContentCaptureOptions options) {
try {
mCallback.setContentCaptureOptions(options);
} catch (RemoteException e) {
Slog.w(TAG, "Unable to send setContentCaptureOptions(): " + e);
}
}
private void registerObserver() {
try {
mCallback.asBinder().linkToDeath(this, 0);
} catch (RemoteException e) {
Slog.w(TAG, "Failed to register callback cleanup " + e);
}
}
private void unregisterObserver() {
mCallback.asBinder().unlinkToDeath(this, 0);
}
@Override
public void binderDied() {
mContentCaptureManagerServiceStub.unregisterContentCaptureOptionsCallback(this);
}
}
}