diff options
| author | Hall Liu <hallliu@google.com> | 2020-11-12 19:47:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-12 19:47:29 +0000 |
| commit | e9f06ec2afbb80fca785cb2fdccdefa26e2c151f (patch) | |
| tree | 36adabfa97ebfc8753b3cc4037b7817f147066b6 | |
| parent | ccd1a25b3eab5ce75f1441ef7dbf8d781cf29fb9 (diff) | |
| parent | e4a53f30bbf1506e603d59d0a5ebecf3777f931f (diff) | |
Merge "Move usage of Runnable::run to TelephonyUtils" am: 9f52302f07 am: e4a53f30bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496999
Change-Id: I642f31c361f32b963554ca7d64e68cf51ce6dae3
| -rw-r--r-- | telephony/common/com/android/internal/telephony/CarrierAppUtils.java | 3 | ||||
| -rw-r--r-- | telephony/common/com/android/internal/telephony/util/TelephonyUtils.java | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/telephony/common/com/android/internal/telephony/CarrierAppUtils.java b/telephony/common/com/android/internal/telephony/CarrierAppUtils.java index 7aecfdde71bc..d1412b772eef 100644 --- a/telephony/common/com/android/internal/telephony/CarrierAppUtils.java +++ b/telephony/common/com/android/internal/telephony/CarrierAppUtils.java @@ -32,6 +32,7 @@ import android.util.ArrayMap; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.telephony.util.TelephonyUtils; import java.util.ArrayList; import java.util.List; @@ -314,7 +315,7 @@ public final class CarrierAppUtils { String[] packageNames = new String[enabledCarrierPackages.size()]; enabledCarrierPackages.toArray(packageNames); permissionManager.grantDefaultPermissionsToEnabledCarrierApps(packageNames, - UserHandle.of(userId), Runnable::run, isSuccess -> { }); + UserHandle.of(userId), TelephonyUtils.DIRECT_EXECUTOR, isSuccess -> { }); } } catch (PackageManager.NameNotFoundException e) { Log.w(TAG, "Could not reach PackageManager", e); diff --git a/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java b/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java index 7736473feafb..02d741011220 100644 --- a/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java +++ b/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java @@ -34,6 +34,7 @@ import java.io.PrintWriter; import java.util.Collections; import java.util.List; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; @@ -44,6 +45,8 @@ public final class TelephonyUtils { public static boolean IS_USER = "user".equals(android.os.Build.TYPE); public static boolean IS_DEBUGGABLE = SystemProperties.getInt("ro.debuggable", 0) == 1; + public static final Executor DIRECT_EXECUTOR = Runnable::run; + /** * Verify that caller holds {@link android.Manifest.permission#DUMP}. * |