Merge "Fix a SecurityExcption when trying to start low-light dream." into tm-qpr-dev (0605e404) · Commits · e / os / android_frameworks_base

core/java/android/service/dreams/DreamService.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1362,6 +1362,11 @@ public class DreamService extends Service implements Window.Callback {
	if (!ActivityTaskManager.getService().startDreamActivity(i)) {		if (!ActivityTaskManager.getService().startDreamActivity(i)) {
	detach();		detach();
	}		}
			} catch (SecurityException e) {
			Log.w(mTag,
			"Received SecurityException trying to start DreamActivity. "
			+ "Aborting dream start.");
			detach();
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.w(mTag, "Could not connect to activity task manager to start dream activity");		Log.w(mTag, "Could not connect to activity task manager to start dream activity");
	e.rethrowFromSystemServer();		e.rethrowFromSystemServer();