Avoid SIM card on/off dialog pop-up if satellite is enabled am: f2ed0ec752
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26847152 Change-Id: Ifb4f85972f29370d51a8c6363fa8efd63e6dead5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
69
src/com/android/settings/network/SatelliteManagerUtil.kt
Normal file
69
src/com/android/settings/network/SatelliteManagerUtil.kt
Normal file
@@ -0,0 +1,69 @@
|
||||
/*
|
||||
* Copyright (C) 2024 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.settings.network
|
||||
|
||||
import android.content.Context
|
||||
import android.os.OutcomeReceiver
|
||||
import android.telephony.satellite.SatelliteManager
|
||||
import android.util.Log
|
||||
import androidx.concurrent.futures.CallbackToFutureAdapter
|
||||
import com.google.common.util.concurrent.Futures.immediateFuture
|
||||
import com.google.common.util.concurrent.ListenableFuture
|
||||
import java.util.concurrent.Executor
|
||||
|
||||
/**
|
||||
* Utility class for interacting with the SatelliteManager API.
|
||||
*/
|
||||
object SatelliteManagerUtil {
|
||||
|
||||
private const val TAG: String = "SatelliteManagerUtil"
|
||||
|
||||
/**
|
||||
* Checks if the satellite modem is enabled.
|
||||
*
|
||||
* @param context The application context
|
||||
* @param executor The executor to run the asynchronous operation on
|
||||
* @return A ListenableFuture that will resolve to `true` if the satellite modem enabled,
|
||||
* `false` otherwise.
|
||||
*/
|
||||
@JvmStatic
|
||||
fun requestIsEnabled(context: Context, executor: Executor): ListenableFuture<Boolean> {
|
||||
val satelliteManager: SatelliteManager? =
|
||||
context.getSystemService(SatelliteManager::class.java)
|
||||
if (satelliteManager == null) {
|
||||
Log.w(TAG, "SatelliteManager is null")
|
||||
return immediateFuture(false)
|
||||
}
|
||||
|
||||
return CallbackToFutureAdapter.getFuture { completer ->
|
||||
satelliteManager.requestIsEnabled(executor,
|
||||
object : OutcomeReceiver<Boolean, SatelliteManager.SatelliteException> {
|
||||
override fun onResult(result: Boolean) {
|
||||
Log.i(TAG, "Satellite modem enabled status: $result")
|
||||
completer.set(result)
|
||||
}
|
||||
|
||||
override fun onError(error: SatelliteManager.SatelliteException) {
|
||||
super.onError(error)
|
||||
Log.w(TAG, "Can't get satellite modem enabled status", error)
|
||||
completer.set(false)
|
||||
}
|
||||
})
|
||||
"requestIsEnabled"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -29,9 +29,14 @@ import android.util.Log;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settingslib.utils.ThreadUtils;
|
||||
import com.android.settings.network.SatelliteManagerUtil;
|
||||
|
||||
import com.google.common.util.concurrent.ListenableFuture;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.concurrent.Executor;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
/** The receiver when the slot status changes. */
|
||||
public class SimSlotChangeReceiver extends BroadcastReceiver {
|
||||
@@ -51,7 +56,25 @@ public class SimSlotChangeReceiver extends BroadcastReceiver {
|
||||
|
||||
public static void runOnBackgroundThread(Context context) {
|
||||
if (shouldHandleSlotChange(context)) {
|
||||
SimSlotChangeHandler.get().onSlotsStatusChange(context.getApplicationContext());
|
||||
Log.d(TAG, "Checking satellite enabled status");
|
||||
Executor executor = Executors.newSingleThreadExecutor();
|
||||
ListenableFuture<Boolean> satelliteEnabledFuture = SatelliteManagerUtil
|
||||
.requestIsEnabled(context, executor);
|
||||
satelliteEnabledFuture.addListener(() -> {
|
||||
boolean isSatelliteEnabled = false;
|
||||
try {
|
||||
isSatelliteEnabled = satelliteEnabledFuture.get();
|
||||
} catch (ExecutionException | InterruptedException e) {
|
||||
Log.w(TAG, "Can't get satellite enabled status", e);
|
||||
}
|
||||
|
||||
if (isSatelliteEnabled) {
|
||||
Log.i(TAG, "Satellite is enabled. Unable to handle SIM slot changes");
|
||||
} else {
|
||||
Log.i(TAG, "Satellite is disabled. Handle slot changes");
|
||||
SimSlotChangeHandler.get().onSlotsStatusChange(context.getApplicationContext());
|
||||
}
|
||||
}, executor);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user