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

Commit 46564997 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Add missing @Override annotations 

also fix import order

Bug: 292141694
Flag: EXEMPT code cleanup
Test: presubmit
Change-Id: I6b44cf275ddaf20a0d02b5155bfc457a3c790949
parent 8bf6f7d8

core/java/android/app/ActivityThread.java

+35 −1
Original line number Diff line number Diff line
@@ -249,8 +249,8 @@ import com.android.internal.util.FastPrintWriter; 
import com.android.internal.util.Preconditions;

import com.android.internal.util.function.pooled.PooledLambda;

import com.android.org.conscrypt.TrustedCertificateStore;

import com.android.server.am.MemInfoDumpProto;

import com.android.server.am.BitmapDumpProto;

import com.android.server.am.MemInfoDumpProto;



import dalvik.annotation.optimization.NeverCompile;

import dalvik.system.AppSpecializationHooks;
@@ -1140,6 +1140,7 @@ public final class ActivityThread extends ClientTransactionHandler 
        private static final String DB_POOL_INFO_HEADER = "  %13s %13s %13s  %s";

        private static final String DB_POOL_INFO_FORMAT = "  %13d %13d %13d  %s";



        @Override

        public final void scheduleReceiver(Intent intent, ActivityInfo info,

                CompatibilityInfo compatInfo, int resultCode, String data, Bundle extras,

                boolean ordered, boolean assumeDelivered, int sendingUser, int processState,
@@ -1155,6 +1156,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            sendMessage(H.RECEIVER, r);

        }



        @Override

        public final void scheduleReceiverList(List<ReceiverInfo> info) throws RemoteException {

            for (int i = 0; i < info.size(); i++) {

                ReceiverInfo r = info.get(i);
@@ -1172,6 +1174,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            }

        }



        @Override

        public final void scheduleCreateBackupAgent(ApplicationInfo app,

                int backupMode, int userId, @BackupDestination int backupDestination) {

            CreateBackupAgentData d = new CreateBackupAgentData();
@@ -1183,6 +1186,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            sendMessage(H.CREATE_BACKUP_AGENT, d);

        }



        @Override

        public final void scheduleDestroyBackupAgent(ApplicationInfo app, int userId) {

            CreateBackupAgentData d = new CreateBackupAgentData();

            d.appInfo = app;
@@ -1191,6 +1195,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            sendMessage(H.DESTROY_BACKUP_AGENT, d);

        }



        @Override

        public final void scheduleCreateService(IBinder token,

                ServiceInfo info, CompatibilityInfo compatInfo, int processState) {

            updateProcessState(processState, false);
@@ -1208,6 +1213,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            sendMessage(H.CREATE_SERVICE, s);

        }



        @Override

        public final void scheduleBindService(IBinder token, IBinder bindToken, Intent intent,

                boolean rebind, int processState, long bindSeq) {

            updateProcessState(processState, false);
@@ -1233,6 +1239,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            sendMessage(H.BIND_SERVICE, s);

        }



        @Override

        public final void scheduleUnbindService(IBinder token, IBinder bindToken, Intent intent) {

            BindServiceData s = new BindServiceData();

            s.token = token;
@@ -1247,6 +1254,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            sendMessage(H.UNBIND_SERVICE, s);

        }



        @Override

        public final void scheduleServiceArgs(IBinder token, ParceledListSlice args) {

            List<ServiceStartArgs> list = args.getList();
@@ -1270,6 +1278,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            }

        }



        @Override

        public final void scheduleStopService(IBinder token) {

            if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {

                Trace.instant(Trace.TRACE_TAG_ACTIVITY_MANAGER, "scheduleStopService. token="
@@ -1430,6 +1439,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            }

        }



        @Override

        public final void runIsolatedEntryPoint(String entryPoint, String[] entryPointArgs) {

            SomeArgs args = SomeArgs.obtain();

            args.arg1 = entryPoint;
@@ -1437,14 +1447,17 @@ public final class ActivityThread extends ClientTransactionHandler 
            sendMessage(H.RUN_ISOLATED_ENTRY_POINT, args);

        }



        @Override

        public final void scheduleExit() {

            sendMessage(H.EXIT_APPLICATION, null);

        }



        @Override

        public final void scheduleSuicide() {

            sendMessage(H.SUICIDE, null);

        }



        @Override

        public void scheduleApplicationInfoChanged(ApplicationInfo ai) {

            synchronized (mResourcesManager) {

                var oldAi = mPendingAppInfoUpdates.put(ai.packageName, ai);
@@ -1461,10 +1474,12 @@ public final class ActivityThread extends ClientTransactionHandler 
            sendMessage(H.APPLICATION_INFO_CHANGED, ai.packageName);

        }



        @Override

        public void updateTimeZone() {

            TimeZone.setDefault(null);

        }



        @Override

        public void clearDnsCache() {

            // a non-standard API to get this to libcore

            InetAddress.clearDnsCache();
@@ -1473,6 +1488,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            NetworkEventDispatcher.getInstance().dispatchNetworkConfigurationChange();

        }



        @Override

        public void updateHttpProxy() {

            final Application app;

            synchronized (ActivityThread.this) {
@@ -1488,11 +1504,13 @@ public final class ActivityThread extends ClientTransactionHandler 
            ActivityThread.updateHttpProxy(app);

        }



        @Override

        public void processInBackground() {

            mH.removeMessages(H.GC_WHEN_IDLE);

            mH.sendMessage(mH.obtainMessage(H.GC_WHEN_IDLE));

        }



        @Override

        public void dumpService(ParcelFileDescriptor pfd, IBinder servicetoken, String[] args) {

            DumpComponentInfo data = new DumpComponentInfo();

            try {
@@ -1510,6 +1528,7 @@ public final class ActivityThread extends ClientTransactionHandler 
        // This function exists to make sure all receiver dispatching is

        // correctly ordered, since these are one-way calls and the binder driver

        // applies transaction ordering per object for such calls.

        @Override

        public void scheduleRegisteredReceiver(IIntentReceiver receiver, Intent intent,

                int resultCode, String dataStr, Bundle extras, boolean ordered,

                boolean sticky, boolean assumeDelivered, int sendingUser, int processState,
@@ -1574,14 +1593,17 @@ public final class ActivityThread extends ClientTransactionHandler 
            sendMessage(H.DUMP_HEAP, dhd, 0, 0, true /*async*/);

        }



        @Override

        public void attachAgent(String agent) {

            sendMessage(H.ATTACH_AGENT, agent);

        }



        @Override

        public void attachStartupAgents(String dataDir) {

            sendMessage(H.ATTACH_STARTUP_AGENTS, dataDir);

        }



        @Override

        public void setSchedulingGroup(int group) {

            // Note: do this immediately, since going into the foreground

            // should happen regardless of what pending work we have to do
@@ -1594,6 +1616,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            }

        }



        @Override

        public void dispatchPackageBroadcast(int cmd, String[] packages) {

            sendMessage(H.DISPATCH_PACKAGE_BROADCAST, packages, cmd);

        }
@@ -1620,6 +1643,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            }

        }



        @Override

        public void dumpActivity(ParcelFileDescriptor pfd, IBinder activitytoken,

                String prefix, String[] args) {

            DumpComponentInfo data = new DumpComponentInfo();
@@ -1636,6 +1660,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            }

        }



        @Override

        public void dumpProvider(ParcelFileDescriptor pfd, IBinder providertoken,

                String[] args) {

            DumpComponentInfo data = new DumpComponentInfo();
@@ -2090,10 +2115,12 @@ public final class ActivityThread extends ClientTransactionHandler 
            sendMessage(H.REQUEST_ASSIST_CONTEXT_EXTRAS, cmd);

        }



        @Override

        public void setCoreSettings(Bundle coreSettings) {

            sendMessage(H.SET_CORE_SETTINGS, coreSettings);

        }



        @Override

        public void updatePackageCompatibilityInfo(String pkg, CompatibilityInfo info) {

            UpdateCompatibilityData ucd = new UpdateCompatibilityData();

            ucd.pkg = pkg;
@@ -2103,6 +2130,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            sendMessage(H.UPDATE_PACKAGE_COMPATIBILITY_INFO, ucd);

        }



        @Override

        public void scheduleTrimMemory(int level) {

            final Runnable r = PooledLambda.obtainRunnable(ActivityThread::handleTrimMemory,

                    ActivityThread.this, level).recycleOnUse();
@@ -2115,15 +2143,18 @@ public final class ActivityThread extends ClientTransactionHandler 
            }

        }



        @Override

        public void scheduleTranslucentConversionComplete(IBinder token, boolean drawComplete) {

            sendMessage(H.TRANSLUCENT_CONVERSION_COMPLETE, token, drawComplete ? 1 : 0);

        }



        @Override

        public void scheduleOnNewSceneTransitionInfo(IBinder token, SceneTransitionInfo info) {

            sendMessage(H.ON_NEW_SCENE_TRANSITION_INFO,

                    new Pair<IBinder, SceneTransitionInfo>(token, info));

        }



        @Override

        public void setProcessState(int state) {

            updateProcessState(state, true);

        }
@@ -2540,6 +2571,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            }

            return Integer.toString(code);

        }

        @Override

        public void handleMessage(Message msg) {

            if (DEBUG_MESSAGES) Slog.v(TAG, ">>> handling: " + codeToString(msg.what));

            long debugStoreId = -1;
@@ -3990,6 +4022,7 @@ public final class ActivityThread extends ClientTransactionHandler 
    }



    @UnsupportedAppUsage

    @Override

    public final Activity getActivity(IBinder token) {

        final ActivityClientRecord activityRecord = mActivities.get(token);

        return activityRecord != null ? activityRecord.activity : null;
@@ -4116,6 +4149,7 @@ public final class ActivityThread extends ClientTransactionHandler 
        return mTransactionExecutor;

    }



    @Override

    void sendMessage(int what, Object obj) {

        sendMessage(what, obj, 0, 0, false);

    }

core/java/android/app/LoadedApk.java

+3 −0
Original line number Diff line number Diff line
@@ -2080,6 +2080,7 @@ public final class LoadedApk { 
                mDispatcher = new WeakReference<LoadedApk.ServiceDispatcher>(sd);

            }



            @Override

            public void connected(ComponentName name, IBinder service, IBinderSession binderSession,

                    boolean dead) throws RemoteException {

                LoadedApk.ServiceDispatcher sd = mDispatcher.get();
@@ -2277,6 +2278,7 @@ public final class LoadedApk { 
                mDead = dead;

            }



            @Override

            public void run() {

                if (mCommand == 0) {

                    doConnected(mName, mService, mBinderSession, mDead);
@@ -2299,6 +2301,7 @@ public final class LoadedApk { 
                mService = service;

            }



            @Override

            public void binderDied() {

                death(mName, mService);

            }

core/java/android/content/ContextWrapper.java

+3 −0
Original line number Diff line number Diff line
@@ -445,12 +445,14 @@ public class ContextWrapper extends Context { 
    }



    /** @hide **/

    @Override

    public void startActivityForResult(

            String who, Intent intent, int requestCode, @Nullable Bundle options) {

        mBase.startActivityForResult(who, intent, requestCode, options);

    }



    /** @hide **/

    @Override

    public boolean canStartActivityForResult() {

        return mBase.canStartActivityForResult();

    }
@@ -1549,6 +1551,7 @@ public class ContextWrapper extends Context { 
     * @hide

     */

    @RequiresPermission(android.Manifest.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS)

    @Override

    public void closeSystemDialogs() {

        mBase.closeSystemDialogs();

    }

test-mock/src/android/test/mock/MockContext.java

+1 −0
Original line number Diff line number Diff line
@@ -799,6 +799,7 @@ public class MockContext extends Context { 
        throw new UnsupportedOperationException();

    }



    @Override

    public void enforceUriPermission(

            Uri uri, String readPermission, String writePermission,

            int pid, int uid, int modeFlags, String message) {