diff options
| author | Youngsang Cho <youngsang@google.com> | 2014-07-18 18:42:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-17 21:58:28 +0000 |
| commit | 6f306e21f4d0b62866d8622b4d4698f6d76de2b2 (patch) | |
| tree | ef949c3a258748813a54ef2e5f271c7b399b1cc9 /services | |
| parent | 427f74293b8fca24803a12ec10013e88db8d3586 (diff) | |
| parent | 903d6b72cd572665309633e925485464d08bb25a (diff) | |
| download | frameworks_base-6f306e21f4d0b62866d8622b4d4698f6d76de2b2.zip frameworks_base-6f306e21f4d0b62866d8622b4d4698f6d76de2b2.tar.gz frameworks_base-6f306e21f4d0b62866d8622b4d4698f6d76de2b2.tar.bz2 | |
Merge "TIF: Add unblock content" into lmp-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/tv/TvInputManagerService.java | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java index d177c39..69c693a 100644 --- a/services/core/java/com/android/server/tv/TvInputManagerService.java +++ b/services/core/java/com/android/server/tv/TvInputManagerService.java @@ -1018,6 +1018,26 @@ public final class TvInputManagerService extends SystemService { } @Override + public void unblockContent(IBinder sessionToken, String unblockedRating, int userId) { + final int callingUid = Binder.getCallingUid(); + final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(), callingUid, + userId, "unblockContent"); + final long identity = Binder.clearCallingIdentity(); + try { + synchronized (mLock) { + try { + getSessionLocked(sessionToken, callingUid, resolvedUserId) + .unblockContent(unblockedRating); + } catch (RemoteException e) { + Slog.e(TAG, "error in unblockContent", e); + } + } + } finally { + Binder.restoreCallingIdentity(identity); + } + } + + @Override public void setCaptionEnabled(IBinder sessionToken, boolean enabled, int userId) { final int callingUid = Binder.getCallingUid(); final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(), callingUid, |