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

Commit e4a53f30 authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Move usage of Runnable::run to TelephonyUtils" am: 9f52302f 

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

Change-Id: Ie76344b6e292e9d71b0603db22405aee27421c6a
parents 0b307f32 9f52302f

telephony/common/com/android/internal/telephony/CarrierAppUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

telephony/common/com/android/internal/telephony/util/TelephonyUtils.java

+3 −0
Original line number Diff line number Diff line
@@ -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}.

     *