Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ead5bc3 authored by Makoto Onuki's avatar Makoto Onuki Committed by Automerger Merge Worker
Browse files

Merge "Only allow the system server to connect to sync adapters" into qt-dev... 

Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5 am: 822fbf61 am: ea69ad58 am: f15b3c25 am: 6a68d207

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



Change-Id: I375f3cfcf050656d5e8c3f2973c8fc2a3362ede0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7ce7f39 6a68d207

core/java/android/content/AbstractThreadedSyncAdapter.java

+20 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 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;
@@ -171,8 +172,20 @@ public abstract class AbstractThreadedSyncAdapter { 
    }



    private class ISyncAdapterImpl extends ISyncAdapter.Stub {

        private boolean isCallerSystem() {

            final long callingUid = Binder.getCallingUid();

            if (callingUid != Process.SYSTEM_UID) {

                android.util.EventLog.writeEvent(0x534e4554, "203229608", -1, "");

                return false;

            }

            return true;

        }



        @Override

        public void onUnsyncableAccount(ISyncAdapterUnsyncableAccountCallback cb) {

            if (!isCallerSystem()) {

                return;

            }

            Handler.getMain().sendMessage(obtainMessage(

                    AbstractThreadedSyncAdapter::handleOnUnsyncableAccount,

                    AbstractThreadedSyncAdapter.this, cb));
@@ -181,12 +194,16 @@ public abstract class AbstractThreadedSyncAdapter { 
        @Override

        public void startSync(ISyncContext syncContext, String authority, Account account,

                Bundle extras) {

            if (!isCallerSystem()) {

                return;

            }

            if (ENABLE_LOG) {

                if (extras != null) {

                    extras.size(); // Unparcel so its toString() will show the contents.

                }

                Log.d(TAG, "startSync() start " + authority + " " + account + " " + extras);

            }



            try {

                final SyncContext syncContextClient = new SyncContext(syncContext);
@@ -242,6 +259,9 @@ public abstract class AbstractThreadedSyncAdapter { 


        @Override

        public void cancelSync(ISyncContext syncContext) {

            if (!isCallerSystem()) {

                return;

            }

            try {

                // synchronize to make sure that mSyncThreads doesn't change between when we

                // check it and when we use it