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

Commit 3b8027f7 authored by Meng Wang's avatar Meng Wang
Browse files

Do not use hidden API DumpUtils 

Make a local copy instead.

Bug: 137202333
Test: make
Change-Id: If1e6312a1ca81df9fa5dcbce9820909b7dc69286
parent 709fd4ae

jarjar-rules-shared.txt

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ rule android.util.Slog* com.android.internal.telephony.Slog@1 
rule android.util.TimeUtils* com.android.internal.telephony.TimeUtils@1

rule com.android.internal.os.SomeArgs* com.android.internal.telephony.SomeArgs@1

rule com.android.internal.util.ArrayUtils* com.android.internal.telephony.ArrayUtils@1

rule com.android.internal.util.DumpUtils* com.android.internal.telephony.DumpUtils@1

rule com.android.internal.util.FastXmlSerializer* com.android.internal.telephony.FastXmlSerializer@1

rule com.android.internal.util.HexDump* com.android.internal.telephony.HexDump@1

rule com.android.internal.util.IndentingPrintWriter* com.android.internal.telephony.IndentingPrintWriter@1

src/java/com/android/internal/telephony/SmsController.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


package com.android.internal.telephony;



import static com.android.internal.util.DumpUtils.checkDumpPermission;

import static com.android.internal.telephony.util.TelephonyUtils.checkDumpPermission;



import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

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

+23 −1
Original line number Diff line number Diff line
@@ -17,17 +17,39 @@ package com.android.internal.telephony.util; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.Context;

import android.content.pm.ComponentInfo;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.os.Binder;

import android.os.RemoteException;

import android.os.SystemProperties;



import java.io.PrintWriter;



/**

 * This class provides various util functions

 */

public final class TelephonyUtils {

    public static boolean IS_USER = "user".equals(android.os.Build.TYPE);



    /**

     * Verify that caller holds {@link android.Manifest.permission#DUMP}.

     *

     * @return true if access should be granted.

     */

    public static boolean checkDumpPermission(Context context, String tag, PrintWriter pw) {

        if (context.checkCallingOrSelfPermission(android.Manifest.permission.DUMP)

                != PackageManager.PERMISSION_GRANTED) {

            pw.println("Permission Denial: can't dump " + tag + " from from pid="

                    + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid()

                    + " due to missing android.permission.DUMP permission");

            return false;

        } else {

            return true;

        }

    }



    /** {@hide} */

    public static String emptyIfNull(@Nullable String str) {

        return str == null ? "" : str;