commit 195e07fd192be6e47e04b524dcbc7bef41febe66
author Youngsang Cho <youngsang@google.com> Thu May 05 18:19:33 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 05 18:19:33 2016 +0000
tree 04217dee5ecd246e771507182ec8556d5aa005d8
parent e43fb2e50f04aec5c260ec3c5ee95e8ca736d8f1
parent 00f8ee28512aa1fd5afb67a61cb258c01e1bb802

Merge "TIF: build TvInput list at onUnlockUser" into nyc-dev
am: 00f8ee2851

* commit '00f8ee28512aa1fd5afb67a61cb258c01e1bb802':
  TIF: build TvInput list at onUnlockUser

Change-Id: I015db7ae0266aa39a88dce6aaf3cd9cc7952d5a7

services/core/java/com/android/server/tv/TvInputManagerService.java

diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java
index b389cf5..7bf0cb2 100644
--- a/services/core/java/com/android/server/tv/TvInputManagerService.java
+++ b/services/core/java/com/android/server/tv/TvInputManagerService.java
@@ -157,6 +157,18 @@
         mTvInputHardwareManager.onBootPhase(phase);
     }
 
+    @Override
+    public void onUnlockUser(int userHandle) {
+        if (DEBUG) Slog.d(TAG, "onUnlockUser(userHandle=" + userHandle + ")");
+        synchronized (mLock) {
+            if (mCurrentUserId != userHandle) {
+                return;
+            }
+            buildTvInputListLocked(mCurrentUserId, null);
+            buildTvContentRatingSystemListLocked(mCurrentUserId);
+        }
+    }
+
     private void registerBroadcastReceivers() {
         PackageMonitor monitor = new PackageMonitor() {
             private void buildTvInputList(String[] packages) {