Merge "Do not use hidden putIntForUser" (7c68e95d) · Commits · e / os / android_frameworks_opt_telephony

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -180,7 +180,7 @@ public class SubscriptionInfoUpdater extends Handler {
		mCurrentlyActiveUserId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0);
		CarrierAppUtils.disableCarrierAppsUntilPrivileged(sContext.getOpPackageName(),
		mPackageManager, mPermissionManager, TelephonyManager.getDefault(),
		sContext.getContentResolver(), mCurrentlyActiveUserId);
		mCurrentlyActiveUserId, sContext);
		}
		}
		}, new IntentFilter(Intent.ACTION_USER_FOREGROUND), null, null);
		@@ -188,7 +188,7 @@ public class SubscriptionInfoUpdater extends Handler {
		mCurrentlyActiveUserId = am.getCurrentUser();
		CarrierAppUtils.disableCarrierAppsUntilPrivileged(sContext.getOpPackageName(),
		mPackageManager, mPermissionManager, TelephonyManager.getDefault(),
		sContext.getContentResolver(), mCurrentlyActiveUserId);
		mCurrentlyActiveUserId, sContext);
		}

		/**
		@@ -571,7 +571,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, mPermissionManager, TelephonyManager.getDefault(),
		sContext.getContentResolver(), mCurrentlyActiveUserId);
		mCurrentlyActiveUserId, sContext);

		/**
		* The sim loading sequence will be