Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move usage of Runnable::run to TelephonyUtils" am: 9f52302f07 am: e4a53f30bb am: e9f06ec2af

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496999

Change-Id: I67e867700813fd871dcd275a1321514eca6acf6b
This commit is contained in:
Hall Liu
2020-11-12 20:00:22 +00:00
committed by Automerger Merge Worker
parent 901b609c95 e9f06ec2af
commit 663fa0dd9a
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/common/com/android/internal/telephony/CarrierAppUtils.java
View File

@@ -32,6 +32,7 @@ import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.util.TelephonyUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -314,7 +315,7 @@ public final class CarrierAppUtils {
String[] packageNames = new String[enabledCarrierPackages.size()]; String[] packageNames = new String[enabledCarrierPackages.size()];
enabledCarrierPackages.toArray(packageNames); enabledCarrierPackages.toArray(packageNames);
permissionManager.grantDefaultPermissionsToEnabledCarrierApps(packageNames, permissionManager.grantDefaultPermissionsToEnabledCarrierApps(packageNames,
UserHandle.of(userId), Runnable::run, isSuccess -> { }); UserHandle.of(userId), TelephonyUtils.DIRECT_EXECUTOR, isSuccess -> { });
} }
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
Log.w(TAG, "Could not reach PackageManager", e); Log.w(TAG, "Could not reach PackageManager", e);

3
telephony/common/com/android/internal/telephony/util/TelephonyUtils.java
View File

@@ -34,6 +34,7 @@ import java.io.PrintWriter;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.function.Supplier; 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_USER = "user".equals(android.os.Build.TYPE);
public static boolean IS_DEBUGGABLE = SystemProperties.getInt("ro.debuggable", 0) == 1; 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}. * Verify that caller holds {@link android.Manifest.permission#DUMP}.
* *