From 3d292322b99a0e2ef78ba62933560a8990dd1d59 Mon Sep 17 00:00:00 2001 From: Peter Wang Date: Tue, 7 Jan 2020 16:46:29 -0800 Subject: [Telephony Mainline] Move TelephonyUtils to telephony/common Bug: 140908357 Test: Build Change-Id: I94764fcf698477285ea366c5c7e90e7bd8a27eb3 Merged-In: I94764fcf698477285ea366c5c7e90e7bd8a27eb3 --- .../internal/telephony/util/TelephonyUtils.java | 103 +++++++++++++++++++++ .../internal/telephony/util/TelephonyUtils.java | 103 --------------------- 2 files changed, 103 insertions(+), 103 deletions(-) create mode 100644 telephony/common/com/android/internal/telephony/util/TelephonyUtils.java delete mode 100644 telephony/java/com/android/internal/telephony/util/TelephonyUtils.java diff --git a/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java b/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java new file mode 100644 index 000000000000..0498d7c31406 --- /dev/null +++ b/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2019 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.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.Bundle; +import android.os.PersistableBundle; +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); + public static boolean IS_DEBUGGABLE = SystemProperties.getInt("ro.debuggable", 0) == 1; + + /** + * 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; + } + } + + /** Returns an empty string if the input is {@code null}. */ + public static String emptyIfNull(@Nullable String str) { + return str == null ? "" : str; + } + + /** Throws a {@link RuntimeException} that wrapps the {@link RemoteException}. */ + public static RuntimeException rethrowAsRuntimeException(RemoteException remoteException) { + throw new RuntimeException(remoteException); + } + + /** + * Returns a {@link ComponentInfo} from the {@link ResolveInfo}, + * or throws an {@link IllegalStateException} if not available. + */ + public static ComponentInfo getComponentInfo(@NonNull ResolveInfo resolveInfo) { + if (resolveInfo.activityInfo != null) return resolveInfo.activityInfo; + if (resolveInfo.serviceInfo != null) return resolveInfo.serviceInfo; + if (resolveInfo.providerInfo != null) return resolveInfo.providerInfo; + throw new IllegalStateException("Missing ComponentInfo!"); + } + + /** + * Filter values in bundle to only basic types. + */ + public static Bundle filterValues(Bundle bundle) { + Bundle ret = new Bundle(bundle); + for (String key : bundle.keySet()) { + Object value = bundle.get(key); + if ((value instanceof Integer) || (value instanceof Long) + || (value instanceof Double) || (value instanceof String) + || (value instanceof int[]) || (value instanceof long[]) + || (value instanceof double[]) || (value instanceof String[]) + || (value instanceof PersistableBundle) || (value == null) + || (value instanceof Boolean) || (value instanceof boolean[])) { + continue; + } + if (value instanceof Bundle) { + ret.putBundle(key, filterValues((Bundle) value)); + continue; + } + if (value.getClass().getName().startsWith("android.")) { + continue; + } + ret.remove(key); + } + return ret; + } +} diff --git a/telephony/java/com/android/internal/telephony/util/TelephonyUtils.java b/telephony/java/com/android/internal/telephony/util/TelephonyUtils.java deleted file mode 100644 index 0498d7c31406..000000000000 --- a/telephony/java/com/android/internal/telephony/util/TelephonyUtils.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (C) 2019 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.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.Bundle; -import android.os.PersistableBundle; -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); - public static boolean IS_DEBUGGABLE = SystemProperties.getInt("ro.debuggable", 0) == 1; - - /** - * 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; - } - } - - /** Returns an empty string if the input is {@code null}. */ - public static String emptyIfNull(@Nullable String str) { - return str == null ? "" : str; - } - - /** Throws a {@link RuntimeException} that wrapps the {@link RemoteException}. */ - public static RuntimeException rethrowAsRuntimeException(RemoteException remoteException) { - throw new RuntimeException(remoteException); - } - - /** - * Returns a {@link ComponentInfo} from the {@link ResolveInfo}, - * or throws an {@link IllegalStateException} if not available. - */ - public static ComponentInfo getComponentInfo(@NonNull ResolveInfo resolveInfo) { - if (resolveInfo.activityInfo != null) return resolveInfo.activityInfo; - if (resolveInfo.serviceInfo != null) return resolveInfo.serviceInfo; - if (resolveInfo.providerInfo != null) return resolveInfo.providerInfo; - throw new IllegalStateException("Missing ComponentInfo!"); - } - - /** - * Filter values in bundle to only basic types. - */ - public static Bundle filterValues(Bundle bundle) { - Bundle ret = new Bundle(bundle); - for (String key : bundle.keySet()) { - Object value = bundle.get(key); - if ((value instanceof Integer) || (value instanceof Long) - || (value instanceof Double) || (value instanceof String) - || (value instanceof int[]) || (value instanceof long[]) - || (value instanceof double[]) || (value instanceof String[]) - || (value instanceof PersistableBundle) || (value == null) - || (value instanceof Boolean) || (value instanceof boolean[])) { - continue; - } - if (value instanceof Bundle) { - ret.putBundle(key, filterValues((Bundle) value)); - continue; - } - if (value.getClass().getName().startsWith("android.")) { - continue; - } - ret.remove(key); - } - return ret; - } -} -- cgit v1.2.3-59-g8ed1b