Merge "Mock TelephonyManager in NotificationManagerService tests." into... (9cc8a972) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/notification/NotificationManagerService.java

+13 −14

Original line number	Original line	Diff line number	Diff line
	@@ -1870,7 +1870,8 @@ public class NotificationManagerService extends SystemService {
	ActivityTaskManagerInternal atm, UsageStatsManagerInternal appUsageStats,		ActivityTaskManagerInternal atm, UsageStatsManagerInternal appUsageStats,
	DevicePolicyManagerInternal dpm, IUriGrantsManager ugm,		DevicePolicyManagerInternal dpm, IUriGrantsManager ugm,
	UriGrantsManagerInternal ugmInternal, AppOpsManager appOps, UserManager userManager,		UriGrantsManagerInternal ugmInternal, AppOpsManager appOps, UserManager userManager,
	NotificationHistoryManager historyManager, StatsManager statsManager) {		NotificationHistoryManager historyManager, StatsManager statsManager,
			TelephonyManager telephonyManager) {
	mHandler = handler;		mHandler = handler;
	Resources resources = getContext().getResources();		Resources resources = getContext().getResources();
	mMaxPackageEnqueueRate = Settings.Global.getFloat(getContext().getContentResolver(),		mMaxPackageEnqueueRate = Settings.Global.getFloat(getContext().getContentResolver(),
	@@ -2013,7 +2014,15 @@ public class NotificationManagerService extends SystemService {
	mInterruptionFilter = mZenModeHelper.getZenModeListenerInterruptionFilter();		mInterruptionFilter = mZenModeHelper.getZenModeListenerInterruptionFilter();

	mUserProfiles.updateCache(getContext());		mUserProfiles.updateCache(getContext());
	listenForCallState();
			telephonyManager.listen(new PhoneStateListener() {
			@Override
			public void onCallStateChanged(int state, String incomingNumber) {
			if (mCallState == state) return;
			if (DBG) Slog.d(TAG, "Call state changed: " + callStateToString(state));
			mCallState = state;
			}
			}, PhoneStateListener.LISTEN_CALL_STATE);

	mSettingsObserver = new SettingsObserver(mHandler);		mSettingsObserver = new SettingsObserver(mHandler);

	@@ -2083,7 +2092,8 @@ public class NotificationManagerService extends SystemService {
	getContext().getSystemService(UserManager.class),		getContext().getSystemService(UserManager.class),
	new NotificationHistoryManager(getContext(), handler),		new NotificationHistoryManager(getContext(), handler),
	mStatsManager = (StatsManager) getContext().getSystemService(		mStatsManager = (StatsManager) getContext().getSystemService(
	Context.STATS_MANAGER));		Context.STATS_MANAGER),
			getContext().getSystemService(TelephonyManager.class));

	// register for various Intents		// register for various Intents
	IntentFilter filter = new IntentFilter();		IntentFilter filter = new IntentFilter();
	@@ -8358,17 +8368,6 @@ public class NotificationManagerService extends SystemService {
	}		}
	}		}

	private void listenForCallState() {
	getContext().getSystemService(TelephonyManager.class).listen(new PhoneStateListener() {
	@Override
	public void onCallStateChanged(int state, String incomingNumber) {
	if (mCallState == state) return;
	if (DBG) Slog.d(TAG, "Call state changed: " + callStateToString(state));
	mCallState = state;
	}
	}, PhoneStateListener.LISTEN_CALL_STATE);
	}

	/**		/**
	* Generates a NotificationRankingUpdate from 'sbns', considering only		* Generates a NotificationRankingUpdate from 'sbns', considering only
	* notifications visible to the given listener.		* notifications visible to the given listener.

services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java

+3 −1

services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -47,6 +47,7 @@ import android.content.pm.UserInfo;
	import android.os.Looper;		import android.os.Looper;
	import android.os.UserHandle;		import android.os.UserHandle;
	import android.os.UserManager;		import android.os.UserManager;
			import android.telephony.TelephonyManager;
	import android.test.suitebuilder.annotation.SmallTest;		import android.test.suitebuilder.annotation.SmallTest;
	import android.testing.AndroidTestingRunner;		import android.testing.AndroidTestingRunner;
	import android.testing.TestableContext;		import android.testing.TestableContext;
	@@ -153,7 +154,7 @@ public class RoleObserverTest extends UiServiceTestCase {
	mock(DevicePolicyManagerInternal.class), mock(IUriGrantsManager.class),		mock(DevicePolicyManagerInternal.class), mock(IUriGrantsManager.class),
	mock(UriGrantsManagerInternal.class),		mock(UriGrantsManagerInternal.class),
	mock(AppOpsManager.class), mUm, mock(NotificationHistoryManager.class),		mock(AppOpsManager.class), mUm, mock(NotificationHistoryManager.class),
	mock(StatsManager.class));		mock(StatsManager.class), mock(TelephonyManager.class));
	} catch (SecurityException e) {		} catch (SecurityException e) {
	if (!e.getMessage().contains("Permission Denial: not allowed to send broadcast")) {		if (!e.getMessage().contains("Permission Denial: not allowed to send broadcast")) {
	throw e;		throw e;

Original line number	Original line	Diff line number	Diff line
	@@ -132,6 +132,7 @@ import android.service.notification.NotificationListenerService;
	import android.service.notification.NotificationStats;		import android.service.notification.NotificationStats;
	import android.service.notification.StatusBarNotification;		import android.service.notification.StatusBarNotification;
	import android.service.notification.ZenPolicy;		import android.service.notification.ZenPolicy;
			import android.telephony.TelephonyManager;
	import android.test.suitebuilder.annotation.SmallTest;		import android.test.suitebuilder.annotation.SmallTest;
	import android.testing.AndroidTestingRunner;		import android.testing.AndroidTestingRunner;
	import android.testing.TestableContext;		import android.testing.TestableContext;
	@@ -467,7 +468,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
	mCompanionMgr, mSnoozeHelper, mUsageStats, mPolicyFile, mActivityManager,		mCompanionMgr, mSnoozeHelper, mUsageStats, mPolicyFile, mActivityManager,
	mGroupHelper, mAm, mAtm, mAppUsageStats,		mGroupHelper, mAm, mAtm, mAppUsageStats,
	mock(DevicePolicyManagerInternal.class), mUgm, mUgmInternal,		mock(DevicePolicyManagerInternal.class), mUgm, mUgmInternal,
	mAppOpsManager, mUm, mHistoryManager, mStatsManager);		mAppOpsManager, mUm, mHistoryManager, mStatsManager,
			mock(TelephonyManager.class));
	mService.onBootPhase(SystemService.PHASE_SYSTEM_SERVICES_READY);		mService.onBootPhase(SystemService.PHASE_SYSTEM_SERVICES_READY);

	mService.setAudioManager(mAudioManager);		mService.setAudioManager(mAudioManager);