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

Commit 9aa3142e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Removing the potential null object access."

parents e7e55645 cbddf0d7

services/core/java/com/android/server/pm/DataLoaderManagerService.java

+1 −10
Original line number Original line Diff line number Diff line
@@ -50,7 +50,7 @@ public class DataLoaderManagerService extends SystemService { 
    private final DataLoaderManagerBinderService mBinderService;

    private final DataLoaderManagerBinderService mBinderService;

    private final Object mLock = new Object();

    private final Object mLock = new Object();

    @GuardedBy("mLock")

    @GuardedBy("mLock")

    private SparseArray<DataLoaderServiceConnection> mServiceConnections;

    private SparseArray<DataLoaderServiceConnection> mServiceConnections = new SparseArray<>();





    public DataLoaderManagerService(Context context) {

    public DataLoaderManagerService(Context context) {

        super(context);

        super(context);
@@ -68,9 +68,6 @@ public class DataLoaderManagerService extends SystemService { 
        public boolean initializeDataLoader(int dataLoaderId, Bundle params,

        public boolean initializeDataLoader(int dataLoaderId, Bundle params,

                IDataLoaderStatusListener listener) {

                IDataLoaderStatusListener listener) {

            synchronized (mLock) {

            synchronized (mLock) {

                if (mServiceConnections == null) {

                    mServiceConnections = new SparseArray<>();

                }

                if (mServiceConnections.get(dataLoaderId) != null) {

                if (mServiceConnections.get(dataLoaderId) != null) {

                    Slog.e(TAG, "Data loader of ID=" + dataLoaderId + " already exists.");

                    Slog.e(TAG, "Data loader of ID=" + dataLoaderId + " already exists.");

                    return false;

                    return false;
@@ -156,9 +153,6 @@ public class DataLoaderManagerService extends SystemService { 
        @Override

        @Override

        public @Nullable IDataLoader getDataLoader(int dataLoaderId) {

        public @Nullable IDataLoader getDataLoader(int dataLoaderId) {

            synchronized (mLock) {

            synchronized (mLock) {

                if (mServiceConnections == null) {

                    return null;

                }

                DataLoaderServiceConnection serviceConnection = mServiceConnections.get(

                DataLoaderServiceConnection serviceConnection = mServiceConnections.get(

                        dataLoaderId, null);

                        dataLoaderId, null);

                if (serviceConnection == null) {

                if (serviceConnection == null) {
@@ -174,9 +168,6 @@ public class DataLoaderManagerService extends SystemService { 
        @Override

        @Override

        public void destroyDataLoader(int dataLoaderId) {

        public void destroyDataLoader(int dataLoaderId) {

            synchronized (mLock) {

            synchronized (mLock) {

                if (mServiceConnections == null) {

                    return;

                }

                DataLoaderServiceConnection serviceConnection = mServiceConnections.get(

                DataLoaderServiceConnection serviceConnection = mServiceConnections.get(

                        dataLoaderId, null);

                        dataLoaderId, null);