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

Commit a501fcb7 authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge changes from topic "Sync-fix-redo" into tm-dev 

* changes:
  Only allow the system server to connect to sync adapters
  Revert "Only allow the system server to connect to sync adapters"
parents 8140b786 58270527

core/java/android/content/AbstractThreadedSyncAdapter.java

+12 −5
Original line number Diff line number Diff line
@@ -172,17 +172,20 @@ public abstract class AbstractThreadedSyncAdapter { 
    }



    private class ISyncAdapterImpl extends ISyncAdapter.Stub {

        private void enforceCallerSystem() {

        private boolean isCallerSystem() {

            final long callingUid = Binder.getCallingUid();

            if (callingUid != Process.SYSTEM_UID) {

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

                return;

                return false;

            }

            return true;

        }



        @Override

        public void onUnsyncableAccount(ISyncAdapterUnsyncableAccountCallback cb) {

            enforceCallerSystem();

            if (!isCallerSystem()) {

                return;

            }

            Handler.getMain().sendMessage(obtainMessage(

                    AbstractThreadedSyncAdapter::handleOnUnsyncableAccount,

                    AbstractThreadedSyncAdapter.this, cb));
@@ -191,13 +194,15 @@ 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);

            }

            enforceCallerSystem();



            try {

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


        @Override

        public void cancelSync(ISyncContext syncContext) {

            enforceCallerSystem();

            if (!isCallerSystem()) {

                return;

            }

            try {

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

                // check it and when we use it