resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp (be3a8ad2) · Commits · e / os / android_frameworks_base

services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -322,7 +322,7 @@ public class NetworkScoreServiceTest {
		}

		@Test
		public void testClearScores_notActiveScorer_noBroadcastNetworkPermission() {
		public void testClearScores_notActiveScorer_noRequestNetworkScoresPermission() {
		when(mNetworkScorerAppManager.isCallerActiveScorer(anyInt())).thenReturn(false);
		when(mContext.checkCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES))
		.thenReturn(PackageManager.PERMISSION_DENIED);
		@@ -335,7 +335,7 @@ public class NetworkScoreServiceTest {
		}

		@Test
		public void testClearScores_activeScorer_noBroadcastNetworkPermission() {
		public void testClearScores_activeScorer_noRequestNetworkScoresPermission() {
		when(mNetworkScorerAppManager.isCallerActiveScorer(anyInt())).thenReturn(true);
		when(mContext.checkCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES))
		.thenReturn(PackageManager.PERMISSION_DENIED);
		@@ -355,7 +355,7 @@ public class NetworkScoreServiceTest {
		}

		@Test
		public void testClearScores_notActiveScorer_hasBroadcastNetworkPermission()
		public void testClearScores_notActiveScorer_hasRequestNetworkScoresPermission()
		throws RemoteException {
		when(mNetworkScorerAppManager.isCallerActiveScorer(anyInt())).thenReturn(false);
		when(mContext.checkCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES))
		@@ -382,7 +382,7 @@ public class NetworkScoreServiceTest {
		}

		@Test
		public void testDisableScoring_notActiveScorer_noBroadcastNetworkPermission() {
		public void testDisableScoring_notActiveScorer_noRequestNetworkScoresPermission() {
		when(mNetworkScorerAppManager.isCallerActiveScorer(anyInt())).thenReturn(false);
		when(mContext.checkCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES))
		.thenReturn(PackageManager.PERMISSION_DENIED);
		@@ -396,7 +396,7 @@ public class NetworkScoreServiceTest {
		}

		@Test
		public void testRegisterNetworkScoreCache_noBroadcastNetworkPermission() {
		public void testRegisterNetworkScoreCache_noRequestNetworkScoresPermission() {
		doThrow(new SecurityException()).when(mContext).enforceCallingOrSelfPermission(
		eq(permission.REQUEST_NETWORK_SCORES), anyString());

		@@ -410,7 +410,7 @@ public class NetworkScoreServiceTest {
		}

		@Test
		public void testUnregisterNetworkScoreCache_noBroadcastNetworkPermission() {
		public void testUnregisterNetworkScoreCache_noRequestNetworkScoresPermission() {
		doThrow(new SecurityException()).when(mContext).enforceCallingOrSelfPermission(
		eq(permission.REQUEST_NETWORK_SCORES), anyString());