Merge "Fix print sensitive log IMSI" (00d61d52) · Commits · e / os / android_frameworks_opt_telephony

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

+15 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import android.graphics.Bitmap;
		import android.graphics.BitmapFactory;
		import android.net.Uri;
		import android.os.Binder;
		import android.os.Build;
		import android.os.Handler;
		import android.os.ParcelUuid;
		import android.os.RegistrantList;
		@@ -1959,13 +1960,26 @@ public class SubscriptionController extends ISub.Stub {
		return result;
		}

		/**
		* Scrub given IMSI on production builds.
		*/
		private String scrubImsi(String imsi) {
		if (Build.IS_ENG) {
		return imsi;
		} else if (imsi != null) {
		return imsi.substring(0, Math.min(6, imsi.length())) + "...";
		} else {
		return "null";
		}
		}

		/**
		* Set IMSI by subscription ID
		* @param imsi IMSI (International Mobile Subscriber Identity)
		* @return the number of records updated
		*/
		public int setImsi(String imsi, int subId) {
		if (DBG) logd("[setImsi]+ imsi:" + imsi + " subId:" + subId);
		if (DBG) logd("[setImsi]+ imsi:" + scrubImsi(imsi) + " subId:" + subId);
		ContentValues value = new ContentValues(1);
		value.put(SubscriptionManager.IMSI, imsi);