Commit b426ba96 authored Mar 09, 2021 by Nazanin Bakhshi Committed by Automerger Merge Worker Mar 09, 2021

Merge "Fix createConfigurationContext's UnsupportedOperationException" am:...

Merge "Fix createConfigurationContext's UnsupportedOperationException" am: b6bc4e78 am: 51ceff1d

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1623579

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6982005e8cfc29ead8d8580d96e51853dbcaff8e

tests/telephonytests/src/com/android/internal/telephony/ContextFixture.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -325,6 +325,11 @@ public class ContextFixture implements TestFixture<Context> {
		return mResources;
		}

		@Override
		public Context createConfigurationContext(Configuration overrideConfiguration) {
		return spy(new FakeContext());
		}

		@Override
		public ApplicationInfo getApplicationInfo() {
		return mApplicationInfo;