Merge "Fixed emergency alert not showing up issue" am: d8da0a4f2b am: bb53f0d5e3 am: 23c9b7b2bf (045c9b24) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/CellBroadcastHandler.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -181,6 +181,8 @@ public class CellBroadcastHandler extends WakeLockStateMachine {
		logd("Device location is outside the broadcast area "
		+ CbGeoUtils.encodeGeometriesToString(broadcastArea));
		}

		sendMessage(EVENT_BROADCAST_NOT_REQUIRED);
		}

		/**

src/java/com/android/internal/telephony/WakeLockStateMachine.java

+20 −3

Original line number	Diff line number	Diff line
		@@ -51,6 +51,9 @@ public abstract class WakeLockStateMachine extends StateMachine {
		/** Release wakelock after a short timeout when returning to idle state. */
		static final int EVENT_RELEASE_WAKE_LOCK = 3;

		/** Broadcast not required due to geo-fencing check */
		static final int EVENT_BROADCAST_NOT_REQUIRED = 4;

		@UnsupportedAppUsage
		protected Phone mPhone;

		@@ -152,13 +155,14 @@ public abstract class WakeLockStateMachine extends StateMachine {
		@Override
		public void exit() {
		mWakeLock.acquire();
		if (DBG) log("acquired wakelock, leaving Idle state");
		if (DBG) log("Idle: acquired wakelock, leaving Idle state");
		}

		@Override
		public boolean processMessage(Message msg) {
		switch (msg.what) {
		case EVENT_NEW_SMS_MESSAGE:
		log("Idle: new cell broadcast message");
		// transition to waiting state if we sent a broadcast
		if (handleSmsMessage(msg)) {
		transitionTo(mWaitingState);
		@@ -166,9 +170,14 @@ public abstract class WakeLockStateMachine extends StateMachine {
		return HANDLED;

		case EVENT_RELEASE_WAKE_LOCK:
		log("Idle: release wakelock");
		releaseWakeLock();
		return HANDLED;

		case EVENT_BROADCAST_NOT_REQUIRED:
		log("Idle: broadcast not required");
		return HANDLED;

		default:
		return NOT_HANDLED;
		}
		@@ -184,19 +193,27 @@ public abstract class WakeLockStateMachine extends StateMachine {
		public boolean processMessage(Message msg) {
		switch (msg.what) {
		case EVENT_NEW_SMS_MESSAGE:
		log("deferring message until return to idle");
		log("Waiting: deferring message until return to idle");
		deferMessage(msg);
		return HANDLED;

		case EVENT_BROADCAST_COMPLETE:
		log("broadcast complete, returning to idle");
		log("Waiting: broadcast complete, returning to idle");
		transitionTo(mIdleState);
		return HANDLED;

		case EVENT_RELEASE_WAKE_LOCK:
		log("Waiting: release wakelock");
		releaseWakeLock();
		return HANDLED;

		case EVENT_BROADCAST_NOT_REQUIRED:
		log("Waiting: broadcast not required");
		if (mReceiverCount.get() == 0) {
		transitionTo(mIdleState);
		}
		return HANDLED;

		default:
		return NOT_HANDLED;
		}