summaryrefslogtreecommitdiff
path: root/core/java/android/content/AbstractThreadedSyncAdapter.java
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2022-04-19 10:53:34 -0700
committerMakoto Onuki <omakoto@google.com>2022-04-19 13:18:52 -0700
commiteef327f536d53b0481500e46cb1fb395012b7bc9 (patch)
tree47e9ea5c0cd837dea286ba9fcd2658facaa195d3 /core/java/android/content/AbstractThreadedSyncAdapter.java
parentd248c68122fdde85125613a55b5c8d1c0d8f9b94 (diff)
Revert "Only allow the system server to connect to sync adapters"
This reverts commit 4df2de83804c33ef5389c7d6d1178abe37292cee. There was a bug in the CL. Rather than fixing it forward, let's revert it and fix it in a follow-up CL, so we'll only have to back-port a single CL. Bug: 203229608 Test: N/A, a follow-up CL will redo this change with a Test: line. Change-Id: I5fddf283ace09996a2e5cfc272f8e9fd8168a114
Diffstat (limited to 'core/java/android/content/AbstractThreadedSyncAdapter.java')
-rw-r--r--core/java/android/content/AbstractThreadedSyncAdapter.java13
1 files changed, 0 insertions, 13 deletions
diff --git a/core/java/android/content/AbstractThreadedSyncAdapter.java b/core/java/android/content/AbstractThreadedSyncAdapter.java
index c4ac483fd10e..a086a308d0d9 100644
--- a/core/java/android/content/AbstractThreadedSyncAdapter.java
+++ b/core/java/android/content/AbstractThreadedSyncAdapter.java
@@ -21,7 +21,6 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainMessa
import android.accounts.Account;
import android.annotation.MainThread;
import android.annotation.NonNull;
-import android.os.Binder;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
@@ -172,17 +171,8 @@ public abstract class AbstractThreadedSyncAdapter {
}
private class ISyncAdapterImpl extends ISyncAdapter.Stub {
- private void enforceCallerSystem() {
- final long callingUid = Binder.getCallingUid();
- if (callingUid != Process.SYSTEM_UID) {
- android.util.EventLog.writeEvent(0x534e4554, "203229608", -1, "");
- return;
- }
- }
-
@Override
public void onUnsyncableAccount(ISyncAdapterUnsyncableAccountCallback cb) {
- enforceCallerSystem();
Handler.getMain().sendMessage(obtainMessage(
AbstractThreadedSyncAdapter::handleOnUnsyncableAccount,
AbstractThreadedSyncAdapter.this, cb));
@@ -197,8 +187,6 @@ public abstract class AbstractThreadedSyncAdapter {
}
Log.d(TAG, "startSync() start " + authority + " " + account + " " + extras);
}
- enforceCallerSystem();
-
try {
final SyncContext syncContextClient = new SyncContext(syncContext);
@@ -254,7 +242,6 @@ public abstract class AbstractThreadedSyncAdapter {
@Override
public void cancelSync(ISyncContext syncContext) {
- enforceCallerSystem();
try {
// synchronize to make sure that mSyncThreads doesn't change between when we
// check it and when we use it