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

Commit 837f8c1e authored by Felipe Leme's avatar Felipe Leme
Browse files

Removed @Deprecated SystemService callback methods that take a userId. 

This is just a plain refactoring: the removed methods in the changed
classes were called by default by the new methods in the superclass
(SystemService).

Test: m
Test: atest NotificationManagerServiceTest BackupManagerServiceRoboTest

Fixes: 161943081

Exempt-From-Owner-Approval: refactoring without side-effects

Change-Id: Ifd8df592eb4494cc0922b7e0b2ff20187b8a8b3e
parent d811429b

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+6 −5
Original line number Original line Diff line number Diff line
@@ -89,6 +89,7 @@ import com.android.server.AppStateTracker; 
import com.android.server.AppStateTrackerImpl;

import com.android.server.AppStateTrackerImpl;

import com.android.server.DeviceIdleInternal;

import com.android.server.DeviceIdleInternal;

import com.android.server.LocalServices;

import com.android.server.LocalServices;

import com.android.server.SystemService.TargetUser;

import com.android.server.job.JobSchedulerServiceDumpProto.ActiveJob;

import com.android.server.job.JobSchedulerServiceDumpProto.ActiveJob;

import com.android.server.job.JobSchedulerServiceDumpProto.PendingJob;

import com.android.server.job.JobSchedulerServiceDumpProto.PendingJob;

import com.android.server.job.controllers.BackgroundJobsController;

import com.android.server.job.controllers.BackgroundJobsController;
@@ -975,24 +976,24 @@ public class JobSchedulerService extends com.android.server.SystemService 
    }

    }





    @Override

    @Override

    public void onStartUser(int userHandle) {

    public void onUserStarting(@NonNull TargetUser user) {

        synchronized (mLock) {

        synchronized (mLock) {

            mStartedUsers = ArrayUtils.appendInt(mStartedUsers, userHandle);

            mStartedUsers = ArrayUtils.appendInt(mStartedUsers, user.getUserIdentifier());

        }

        }

        // Let's kick any outstanding jobs for this user.

        // Let's kick any outstanding jobs for this user.

        mHandler.obtainMessage(MSG_CHECK_JOB).sendToTarget();

        mHandler.obtainMessage(MSG_CHECK_JOB).sendToTarget();

    }

    }





    @Override

    @Override

    public void onUnlockUser(int userHandle) {

    public void onUserUnlocking(@NonNull TargetUser user) {

        // Let's kick any outstanding jobs for this user.

        // Let's kick any outstanding jobs for this user.

        mHandler.obtainMessage(MSG_CHECK_JOB).sendToTarget();

        mHandler.obtainMessage(MSG_CHECK_JOB).sendToTarget();

    }

    }





    @Override

    @Override

    public void onStopUser(int userHandle) {

    public void onUserStopping(@NonNull TargetUser user) {

        synchronized (mLock) {

        synchronized (mLock) {

            mStartedUsers = ArrayUtils.removeInt(mStartedUsers, userHandle);

            mStartedUsers = ArrayUtils.removeInt(mStartedUsers, user.getUserIdentifier());

        }

        }

    }

    }

services/appwidget/java/com/android/server/appwidget/AppWidgetService.java

+7 −5
Original line number Original line Diff line number Diff line
@@ -16,11 +16,13 @@ 




package com.android.server.appwidget;

package com.android.server.appwidget;





import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.Context;

import android.content.Context;





import com.android.server.AppWidgetBackupBridge;

import com.android.server.AppWidgetBackupBridge;

import com.android.server.FgThread;

import com.android.server.SystemService;

import com.android.server.SystemService;

import com.android.server.SystemService.TargetUser;





/**

/**

 * SystemService that publishes an IAppWidgetService.

 * SystemService that publishes an IAppWidgetService.
@@ -49,12 +51,12 @@ public class AppWidgetService extends SystemService { 
    }

    }





    @Override

    @Override

    public void onStopUser(int userHandle) {

    public void onUserStopping(@NonNull TargetUser user) {

        mImpl.onUserStopped(userHandle);

        mImpl.onUserStopped(user.getUserIdentifier());

    }

    }





    @Override

    @Override

    public void onSwitchUser(int userHandle) {

    public void onUserSwitching(@Nullable TargetUser from, @NonNull TargetUser to) {

        mImpl.reloadWidgetsMaskedStateForGroup(userHandle);

        mImpl.reloadWidgetsMaskedStateForGroup(to.getUserIdentifier());

    }

    }

}
 
}

services/autofill/java/com/android/server/autofill/AutofillManagerService.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -84,6 +84,7 @@ import com.android.internal.util.Preconditions; 
import com.android.internal.util.SyncResultReceiver;

import com.android.internal.util.SyncResultReceiver;

import com.android.server.FgThread;

import com.android.server.FgThread;

import com.android.server.LocalServices;

import com.android.server.LocalServices;

import com.android.server.SystemService.TargetUser;

import com.android.server.autofill.ui.AutoFillUI;

import com.android.server.autofill.ui.AutoFillUI;

import com.android.server.infra.AbstractMasterSystemService;

import com.android.server.infra.AbstractMasterSystemService;

import com.android.server.infra.FrameworkResourcesServiceNameResolver;

import com.android.server.infra.FrameworkResourcesServiceNameResolver;
@@ -363,7 +364,7 @@ public final class AutofillManagerService 
    }

    }





    @Override // from SystemService

    @Override // from SystemService

    public void onSwitchUser(int userHandle) {

    public void onUserSwitching(@Nullable TargetUser from, @NonNull TargetUser to) {

        if (sDebug) Slog.d(TAG, "Hiding UI when user switched");

        if (sDebug) Slog.d(TAG, "Hiding UI when user switched");

        mUi.hideAll(null);

        mUi.hideAll(null);

    }

    }

services/backup/java/com/android/server/backup/BackupManagerService.java

+6 −4
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.backup; 
import static java.util.Collections.emptySet;

import static java.util.Collections.emptySet;





import android.Manifest;

import android.Manifest;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.UserIdInt;

import android.annotation.UserIdInt;

import android.app.ActivityManager;

import android.app.ActivityManager;
@@ -60,6 +61,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.util.DumpUtils;

import com.android.internal.util.DumpUtils;

import com.android.server.SystemConfig;

import com.android.server.SystemConfig;

import com.android.server.SystemService;

import com.android.server.SystemService;

import com.android.server.SystemService.TargetUser;

import com.android.server.backup.utils.RandomAccessFileUtils;

import com.android.server.backup.utils.RandomAccessFileUtils;





import java.io.File;

import java.io.File;
@@ -1605,13 +1607,13 @@ public class BackupManagerService extends IBackupManager.Stub { 
        }

        }





        @Override

        @Override

        public void onUnlockUser(int userId) {

        public void onUserUnlocking(@NonNull TargetUser user) {

            sInstance.onUnlockUser(userId);

            sInstance.onUnlockUser(user.getUserIdentifier());

        }

        }





        @Override

        @Override

        public void onStopUser(int userId) {

        public void onUserStopping(@NonNull TargetUser user) {

            sInstance.onStopUser(userId);

            sInstance.onStopUser(user.getUserIdentifier());

        }

        }





        @VisibleForTesting

        @VisibleForTesting

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainRunna 
import static java.util.concurrent.TimeUnit.MINUTES;

import static java.util.concurrent.TimeUnit.MINUTES;





import android.annotation.CheckResult;

import android.annotation.CheckResult;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.app.AppOpsManager;

import android.app.AppOpsManager;

import android.app.PendingIntent;

import android.app.PendingIntent;
@@ -84,6 +85,7 @@ import com.android.internal.util.function.pooled.PooledLambda; 
import com.android.server.FgThread;

import com.android.server.FgThread;

import com.android.server.LocalServices;

import com.android.server.LocalServices;

import com.android.server.SystemService;

import com.android.server.SystemService;

import com.android.server.SystemService.TargetUser;

import com.android.server.wm.ActivityTaskManagerInternal;

import com.android.server.wm.ActivityTaskManagerInternal;





import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParser;
@@ -189,7 +191,8 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 
    }

    }





    @Override

    @Override

    public void onUnlockUser(int userHandle) {

    public void onUserUnlocking(@NonNull TargetUser user) {

        int userHandle = user.getUserIdentifier();

        Set<Association> associations = readAllAssociations(userHandle);

        Set<Association> associations = readAllAssociations(userHandle);

        if (associations == null || associations.isEmpty()) {

        if (associations == null || associations.isEmpty()) {

            return;

            return;