Merge "Add SIM PIN caching availability in dump" into sc-dev (de114834) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/uicc/PinStorage.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -937,13 +937,21 @@ public class PinStorage extends Handler {

		/** Returns if the PIN cache is allowed for a given slot. */
		private boolean isCacheAllowed(int slotId) {
		// Check overall device support
		return isCacheAllowedByDevice() && isCacheAllowedByCarrier(slotId);
		}

		/** Returns if the PIN cache is allowed by the device. */
		private boolean isCacheAllowedByDevice() {
		if (!mContext.getResources().getBoolean(
		R.bool.config_allow_pin_storage_for_unattended_reboot)) {
		logv("Pin caching disabled in resources");
		return false;
		}
		// Check carrier configuration
		return true;
		}

		/** Returns if the PIN cache is allowed by carrier for a given slot. */
		private boolean isCacheAllowedByCarrier(int slotId) {
		PersistableBundle config = null;
		CarrierConfigManager configManager =
		mContext.getSystemService(CarrierConfigManager.class);
		@@ -1161,6 +1169,11 @@ public class PinStorage extends Handler {
		pw.println(" mIsDeviceLocked=" + mIsDeviceLocked);
		pw.println(" isLongTermSecretKey=" + (boolean) (mLongTermSecretKey != null));
		pw.println(" isShortTermSecretKey=" + (boolean) (mShortTermSecretKey != null));
		pw.println(" isCacheAllowedByDevice=" + isCacheAllowedByDevice());
		int slotCount = getSlotCount();
		for (int i = 0; i < slotCount; i++) {
		pw.println(" isCacheAllowedByCarrier[" + i + "]=" + isCacheAllowedByCarrier(i));
		}
		if (VDBG) {
		SparseArray<StoredPin> storedPins = loadPinInformation();
		for (int i = 0; i < storedPins.size(); i++) {