Commit 4573cc60 authored Jan 06, 2020 by Sooraj Sasindran

Do not use hidden putIntForUser

Do not use hidden

Secure;->getIntForUser
Secure;->putIntForUser

Bug: 146354533
Test: unit test

com.android.frameworks.telephonytests (25 Tests)
[1/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_EmptyList: PASSED (379ms)
[2/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_HasPrivileges_Associated_Default: PASSED (77ms)
[3/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_HasPrivileges_Associated_DisabledUntilUsed: PASSED (0ms)
[4/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_HasPrivileges_Disabled: PASSED (26ms)
[5/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_HasPrivileges_DisabledUser: PASSED (25ms)
[6/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_HasPrivileges_Enabled: PASSED (51ms)
[7/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_HasPrivileges_MissingAssociated_Default: PASSED (26ms)
[8/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_HasPrivileges_UpdatedApp: PASSED (26ms)
[9/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_HasPrivileges_UpdatedAssociated_DisabledUntilUsed: PASSED (51ms)
[10/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_MissingApp: PASSED (50ms)
[11/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_NoPrivileges_Associated_Default: PASSED (1ms)
[12/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_NoPrivileges_Associated_Default_AlreadyRun: PASSED (51ms)
[13/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_NoPrivileges_Disabled: PASSED (0ms)
[14/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_NoPrivileges_DisabledUntilUsed: PASSED (26ms)
[15/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_NoPrivileges_DisabledUser: PASSED (25ms)
[16/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_NoPrivileges_Enabled: PASSED (51ms)
[17/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_NoPrivileges_EnabledAssociated_Default: PASSED (26ms)
[18/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_NoPrivileges_UpdatedApp: PASSED (25ms)
[19/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_NonSystemApp: PASSED (26ms)
[20/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_NullPrivileges_Default: PASSED (26ms)
[21/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_NullPrivileges_Disabled: PASSED (25ms)
[22/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_NullPrivileges_DisabledUntilUsed: PASSED (26ms)
[23/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_NullPrivileges_DisabledUser: PASSED (25ms)
[24/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_NullPrivileges_Enabled: PASSED (26ms)
[25/25] com.android.internal.telephony.CarrierAppUtilsTest#testDisableCarrierAppsUntilPrivileged_NullPrivileges_UpdatedApp: PASSED (26ms)

Merged-In: Ibaa0f79676fa113f6f6dc128e5352ef6dfaa557a
Change-Id: Ibaa0f79676fa113f6f6dc128e5352ef6dfaa557a

parent 40d58ca3

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -55,7 +55,6 @@ import android.telephony.euicc.EuiccManager;
		import android.text.TextUtils;
		import android.util.Pair;

		import com.android.telephony.Rlog;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.euicc.EuiccController;
		import com.android.internal.telephony.metrics.TelephonyMetrics;
		@@ -64,6 +63,7 @@ import com.android.internal.telephony.uicc.IccUtils;
		import com.android.internal.telephony.uicc.UiccCard;
		import com.android.internal.telephony.uicc.UiccController;
		import com.android.internal.telephony.uicc.UiccSlot;
		import com.android.telephony.Rlog;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		@@ -174,7 +174,7 @@ public class SubscriptionInfoUpdater extends Handler {
		mCurrentlyActiveUserId = newUserId;
		CarrierAppUtils.disableCarrierAppsUntilPrivileged(sContext.getOpPackageName(),
		mPackageManager, TelephonyManager.getDefault(),
		sContext.getContentResolver(), mCurrentlyActiveUserId);
		mCurrentlyActiveUserId, sContext);

		if (reply != null) {
		try {
		@@ -191,8 +191,8 @@ public class SubscriptionInfoUpdater extends Handler {
		logd("Couldn't get current user ID; guessing it's 0: " + e.getMessage());
		}
		CarrierAppUtils.disableCarrierAppsUntilPrivileged(sContext.getOpPackageName(),
		mPackageManager, TelephonyManager.getDefault(), sContext.getContentResolver(),
		mCurrentlyActiveUserId);
		mPackageManager, TelephonyManager.getDefault(),
		mCurrentlyActiveUserId, sContext);
		}

		/**
		@@ -587,7 +587,7 @@ public class SubscriptionInfoUpdater extends Handler {
		// Update set of enabled carrier apps now that the privilege rules may have changed.
		CarrierAppUtils.disableCarrierAppsUntilPrivileged(sContext.getOpPackageName(),
		mPackageManager, TelephonyManager.getDefault(),
		sContext.getContentResolver(), mCurrentlyActiveUserId);
		mCurrentlyActiveUserId, sContext);

		/**
		* The sim loading sequence will be