TvInput:prohibit action when eas[3/3]

PD# 154709

prohibit remote controler and cec when
eas is in progress.

Change-Id: Ibca70ae31018b912e10c50b47bfcdf6233ec3ed5

3 files changed, 26 insertions, 4 deletions

diff --git a/DroidLogicTvInput/res/layout/layout_overlay.xml b/DroidLogicTvInput/res/layout/layout_overlay.xml
index d815a23..32cc2d6 100644
--- a/DroidLogicTvInput/res/layout/layout_overlay.xml
+++ b/DroidLogicTvInput/res/layout/layout_overlay.xml
@@ -41,7 +41,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:gravity="center"
-        android:text="@string/nosignal"
         android:textSize="30sp"
         android:textStyle="bold"
         android:textColor="@android:color/white"
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java
index 934110f..860ccb5 100644
--- a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java
+++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java
@@ -1234,13 +1234,23 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
             super.notifyVideoAvailable();
             mTvControlManager.setAmAudioPreMute(TvControlManager.AUDIO_UNMUTE_FOR_TV);
             mSubtitleView.setVisible(is_subtitle_enabled);
+            Log.i(TAG,"mCurrentUri = "+mCurrentUri+",mEasprocessManager = "+mEASProcessManager);
+            if (mEASProcessManager != null &&
+                    mEASProcessManager.isEasInProgress() &&
+                    mEASProcessManager.getEasChannelUri().equals(mCurrentUri)) {
+                notifyAppEasStatus(true);
+                showEasText();
+            }
         }
 
         @Override
         public void notifyVideoUnavailable(int reason) {
             Log.d(TAG, "notifyVideoUnavailable: "+reason+", "+getSessionId());
             super.notifyVideoUnavailable(reason);
-
+            Log.i(TAG,"measprocessManager = "+mEASProcessManager);
+            if (mEASProcessManager != null && mEASProcessManager.isEasInProgress()) {
+                notifyAppEasStatus(false);
+            }
             if (mOverlayView != null) {
                 switch (reason) {
                     case TvInputManager.VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY:
@@ -1258,6 +1268,7 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
                         mOverlayView.setImage(R.drawable.bg_no_signal);
                         mOverlayView.setImageVisibility(true);
                         mOverlayView.setTextVisibility(true);
+                        mOverlayView.setEasTextVisibility(false);
                         mSubtitleView.setVisible(false);
                         break;
                 }
@@ -3349,8 +3360,9 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
                 mOverlayView.setImageVisibility(false);
                 mOverlayView.setTextForEas(mEasText);
                 mOverlayView.setEasTextVisibility(true);
-            } else
+            } else {
                 mOverlayView.setEasTextVisibility(false);
+            }
         }
     }
 
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/EASProcessManager.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/EASProcessManager.java
index b94f34b..39136d9 100644
--- a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/EASProcessManager.java
+++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/EASProcessManager.java
@@ -31,6 +31,7 @@ public class EASProcessManager{
     private Uri mCurrentUri = null;
     private EasProcessCallback mCallback;
     private TvDataBaseManager mTvDataBaseManager = null;
+    private Uri easChannelUri = null;
 
     public EASProcessManager(Context context) {
         Log.d(TAG,"***** eas process manager *****");
@@ -147,6 +148,14 @@ public class EASProcessManager{
         mCallback.onUpdateEasText(easText);
     }
 
+    public Uri getEasChannelUri() {
+        return easChannelUri;
+    }
+
+    public void setEasChannelUri(Uri mUri) {
+        easChannelUri = mUri;
+    }
+
     public void processDetailsChannelAlert(EasEvent easEvent){
         if (DEBUG) Log.d(TAG,"processDetailsChannelAlert,time = "+easEvent.alertMessageTimeRemaining+
             ",isEasInProgress = "+isEasInProgress);
@@ -155,7 +164,7 @@ public class EASProcessManager{
         int timeToOriginalChannelInMillis = easEvent.alertMessageTimeRemaining * 1000;
         setOriginalChannel();
         isEasInProgress = true;
-        mCallback.onEasEnd();
+        mCallback.onEasStart();
         mHandler.removeCallbacks(mTuneToOriginalChannelRunnable);
         mHandler.removeCallbacks(mCancelEasAlertTextDisplayRunnable);
         if (!isAlreadyTuneToDetailsChannel(majorNum, minorNum)) {
@@ -163,6 +172,7 @@ public class EASProcessManager{
             if (detailChannel != null) {
                 if (DEBUG) Log.d(TAG,"tune to detail channel");
                 Uri channelUri = TvContract.buildChannelUri(detailChannel.getId());
+                setEasChannelUri(channelUri);
                 launchLiveTv(channelUri);
             }else {
                 if (DEBUG) Log.d(TAG,"detail channel is unavailable");
@@ -208,6 +218,7 @@ public class EASProcessManager{
         mContext.startActivity(intent);
    }
 
+
     public  class ChannelNumber {
         public   String PRIMARY_CHANNEL_DELIMITER = "-";
         public  String[] CHANNEL_DELIMITERS = {"-", ".", " "};