Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89f10532 authored Dec 07, 2018 by James Lemieux

Remove unnecessary Shadows

Test: make -j56 RunSettingsLibRoboTests
Change-Id: Id26bfa43946a1aeab80acc7bd550888b6269cf16

parent f9eeca13

packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowActivityManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,12 +36,12 @@ public class ShadowActivityManager {
		}

		@Implementation
		public static int getCurrentUser() {
		protected static int getCurrentUser() {
		return sCurrentUserId;
		}

		@Implementation
		public boolean switchUser(int userId) {
		protected boolean switchUser(int userId) {
		mUserSwitchedTo = userId;
		return true;
		}

packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowBluetoothAdapter.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ public class ShadowBluetoothAdapter extends org.robolectric.shadows.ShadowBlueto
		private BluetoothProfile.ServiceListener mServiceListener;

		@Implementation
		public boolean getProfileProxy(Context context, BluetoothProfile.ServiceListener listener,
		protected boolean getProfileProxy(Context context, BluetoothProfile.ServiceListener listener,
		int profile) {
		mServiceListener = listener;
		return true;
		@@ -43,7 +43,7 @@ public class ShadowBluetoothAdapter extends org.robolectric.shadows.ShadowBlueto
		}

		@Implementation
		public List<Integer> getSupportedProfiles() {
		protected List<Integer> getSupportedProfiles() {
		return mSupportedProfiles;
		}

packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowDefaultDialerManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ public class ShadowDefaultDialerManager {
		}

		@Implementation
		public static String getDefaultDialerApplication(Context context) {
		protected static String getDefaultDialerApplication(Context context) {
		return sDefaultDialer;
		}

packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowSmsApplication.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ public class ShadowSmsApplication {
		}

		@Implementation
		public static ComponentName getDefaultSmsApplication(Context context, boolean updateIfNeeded) {
		protected static ComponentName getDefaultSmsApplication(Context context, boolean update) {
		return sDefaultSmsApplication;
		}

packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowUserManager.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -21,11 +21,8 @@ import android.content.Context;
		import android.content.pm.UserInfo;
		import android.os.UserManager;

		import org.robolectric.RuntimeEnvironment;
		import org.robolectric.annotation.Implementation;
		import org.robolectric.annotation.Implements;
		import org.robolectric.annotation.Resetter;
		import org.robolectric.shadow.api.Shadow;

		import java.util.ArrayList;
		import java.util.List;
		@@ -56,5 +53,4 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager
		protected List<UserInfo> getProfiles(@UserIdInt int userHandle) {
		return getProfiles();
		}

		}