Merge "Make getIEuiccContronller() protected and non-static for CTS." am: 2378a2ca0b am: 24ba89dafe (e3ff0712) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/euicc/EuiccManager.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import android.annotation.IntDef;
		import android.annotation.Nullable;
		import android.annotation.SdkConstant;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.app.Activity;
		import android.app.PendingIntent;
		import android.content.Context;
		@@ -598,7 +599,11 @@ public class EuiccManager {
		}
		}

		private static IEuiccController getIEuiccController() {
		/**
		* @hide
		*/
		@TestApi
		protected IEuiccController getIEuiccController() {
		return IEuiccController.Stub.asInterface(ServiceManager.getService("econtroller"));
		}
		}