From 60c90994986f55b78a7d3d2a39d6463a960847de Mon Sep 17 00:00:00 2001 From: Jayachandran C Date: Thu, 21 Nov 2019 11:23:19 -0800 Subject: [PATCH] Telephony-sdk: Replace usage of Slog with Rlog Bug: 140908357 Test: Build Change-Id: I7fa10bce115e9261a0fe99eb9024ec17a879e975 --- .../internal/telephony/CarrierAppUtils.java | 18 +++++++++--------- .../telephony/gsm/GsmSmsCbMessage.java | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/telephony/java/com/android/internal/telephony/CarrierAppUtils.java b/telephony/java/com/android/internal/telephony/CarrierAppUtils.java index 0d4fd0f620a27..e6bebbb62153c 100644 --- a/telephony/java/com/android/internal/telephony/CarrierAppUtils.java +++ b/telephony/java/com/android/internal/telephony/CarrierAppUtils.java @@ -25,10 +25,10 @@ import android.content.res.Resources; import android.os.RemoteException; import android.permission.IPermissionManager; import android.provider.Settings; +import android.telephony.Rlog; import android.telephony.TelephonyManager; import android.util.ArrayMap; import android.util.ArraySet; -import android.util.Slog; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; @@ -78,7 +78,7 @@ public final class CarrierAppUtils { IPackageManager packageManager, IPermissionManager permissionManager, TelephonyManager telephonyManager, ContentResolver contentResolver, int userId) { if (DEBUG) { - Slog.d(TAG, "disableCarrierAppsUntilPrivileged"); + Rlog.d(TAG, "disableCarrierAppsUntilPrivileged"); } SystemConfig config = SystemConfig.getInstance(); ArraySet systemCarrierAppsDisabledUntilUsed = @@ -105,7 +105,7 @@ public final class CarrierAppUtils { IPackageManager packageManager, IPermissionManager permissionManager, ContentResolver contentResolver, int userId) { if (DEBUG) { - Slog.d(TAG, "disableCarrierAppsUntilPrivileged"); + Rlog.d(TAG, "disableCarrierAppsUntilPrivileged"); } SystemConfig config = SystemConfig.getInstance(); ArraySet systemCarrierAppsDisabledUntilUsed = @@ -174,7 +174,7 @@ public final class CarrierAppUtils { || ai.enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED || (ai.flags & ApplicationInfo.FLAG_INSTALLED) == 0)) { - Slog.i(TAG, "Update state(" + packageName + "): ENABLED for user " + Rlog.i(TAG, "Update state(" + packageName + "): ENABLED for user " + userId); packageManager.setSystemAppInstallState( packageName, @@ -197,7 +197,7 @@ public final class CarrierAppUtils { PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED || (associatedApp.flags & ApplicationInfo.FLAG_INSTALLED) == 0) { - Slog.i(TAG, "Update associated state(" + associatedApp.packageName + Rlog.i(TAG, "Update associated state(" + associatedApp.packageName + "): ENABLED for user " + userId); packageManager.setSystemAppInstallState( associatedApp.packageName, @@ -222,7 +222,7 @@ public final class CarrierAppUtils { && ai.enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT && (ai.flags & ApplicationInfo.FLAG_INSTALLED) != 0) { - Slog.i(TAG, "Update state(" + packageName + Rlog.i(TAG, "Update state(" + packageName + "): DISABLED_UNTIL_USED for user " + userId); packageManager.setSystemAppInstallState( packageName, @@ -240,7 +240,7 @@ public final class CarrierAppUtils { == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT && (associatedApp.flags & ApplicationInfo.FLAG_INSTALLED) != 0) { - Slog.i(TAG, + Rlog.i(TAG, "Update associated state(" + associatedApp.packageName + "): DISABLED_UNTIL_USED for user " + userId); packageManager.setSystemAppInstallState( @@ -268,7 +268,7 @@ public final class CarrierAppUtils { permissionManager.grantDefaultPermissionsToEnabledCarrierApps(packageNames, userId); } } catch (RemoteException e) { - Slog.w(TAG, "Could not reach PackageManager", e); + Rlog.w(TAG, "Could not reach PackageManager", e); } } @@ -390,7 +390,7 @@ public final class CarrierAppUtils { return ai; } } catch (RemoteException e) { - Slog.w(TAG, "Could not reach PackageManager", e); + Rlog.w(TAG, "Could not reach PackageManager", e); } return null; } diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java b/telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java index 5ce42fd3a7aa4..d03419d22150a 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java @@ -30,10 +30,10 @@ import android.telephony.CbGeoUtils.Circle; import android.telephony.CbGeoUtils.Geometry; import android.telephony.CbGeoUtils.LatLng; import android.telephony.CbGeoUtils.Polygon; +import android.telephony.Rlog; import android.telephony.SmsCbLocation; import android.telephony.SmsCbMessage; import android.util.Pair; -import android.util.Slog; import com.android.internal.R; import com.android.internal.telephony.GsmAlphabet; @@ -131,7 +131,7 @@ public class GsmSmsCbMessage { } catch (Exception ex) { // Catch the exception here, the message will be considered as having no WAC // information which means the message will be broadcasted directly. - Slog.e(TAG, "Can't parse warning area coordinates, ex = " + ex.toString()); + Rlog.e(TAG, "Can't parse warning area coordinates, ex = " + ex.toString()); } } @@ -198,7 +198,7 @@ public class GsmSmsCbMessage { } return new GeoFencingTriggerMessage(type, cbIdentifiers); } catch (Exception ex) { - Slog.e(TAG, "create geo-fencing trigger failed, ex = " + ex.toString()); + Rlog.e(TAG, "create geo-fencing trigger failed, ex = " + ex.toString()); return null; } }