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

Commit 3ac69fd2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Do not use hidden HandlerExecutor" am: 166c8761 am: 2072de8f 

Change-Id: Ic4710704a12bd0bc061d26390199355ed926557c
parents 39d6ba88 2072de8f

telephony/java/android/telephony/SubscriptionManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -48,7 +48,6 @@ import android.net.Uri; 
import android.os.Binder;

import android.os.Binder;

import android.os.Build;

import android.os.Build;

import android.os.Handler;

import android.os.Handler;

import android.os.HandlerExecutor;

import android.os.Looper;

import android.os.Looper;

import android.os.ParcelUuid;

import android.os.ParcelUuid;

import android.os.Process;

import android.os.Process;
@@ -64,6 +63,7 @@ import android.util.Pair; 
import com.android.internal.telephony.ISetOpportunisticDataCallback;

import com.android.internal.telephony.ISetOpportunisticDataCallback;

import com.android.internal.telephony.ISub;

import com.android.internal.telephony.ISub;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.util.HandlerExecutor;

import com.android.internal.util.Preconditions;

import com.android.internal.util.Preconditions;





import java.lang.annotation.Retention;

import java.lang.annotation.Retention;

telephony/java/com/android/ims/ImsConfig.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.ims;

package com.android.ims;





import android.os.Handler;

import android.os.Handler;

import android.os.HandlerExecutor;

import android.os.Looper;

import android.os.Looper;

import android.os.RemoteException;

import android.os.RemoteException;

import android.telephony.Rlog;

import android.telephony.Rlog;
@@ -26,6 +25,8 @@ import android.telephony.ims.ProvisioningManager; 
import android.telephony.ims.aidl.IImsConfig;

import android.telephony.ims.aidl.IImsConfig;

import android.telephony.ims.aidl.IImsConfigCallback;

import android.telephony.ims.aidl.IImsConfigCallback;





import com.android.internal.telephony.util.HandlerExecutor;



import java.util.concurrent.Executor;

import java.util.concurrent.Executor;





/**

/**

telephony/java/com/android/internal/telephony/util/HandlerExecutor.java

0 → 100644
+47 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.internal.telephony.util;



import android.annotation.NonNull;

import android.os.Handler;



import java.util.concurrent.Executor;

import java.util.concurrent.RejectedExecutionException;



/**

 * An adapter {@link Executor} that posts all executed tasks onto the given

 * {@link Handler}.

 *

 * @hide

 */

public class HandlerExecutor implements Executor {

    private final Handler mHandler;



    public HandlerExecutor(@NonNull Handler handler) {

        if (handler == null) {

            throw new NullPointerException();

        }

        mHandler = handler;

    }



    @Override

    public void execute(Runnable command) {

        if (!mHandler.post(command)) {

            throw new RejectedExecutionException(mHandler + " is shutting down");

        }

    }

}