Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TIF: Add annotations for the system APIs which requires permissions" into nyc-dev

Browse Source
This commit is contained in:
Dongwon Kang
2016-03-15 14:50:46 +00:00
committed by Android (Google) Code Review
parent f068cff176 89813b8162
commit 49fd7f1d6e
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/java/android/media/tv/TvInputManager.java
View File

@@ -19,6 +19,7 @@ package android.media.tv;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.annotation.SystemApi;
import android.graphics.Rect;
import android.media.PlaybackParams;
@@ -1241,6 +1242,7 @@ public final class TvInputManager {
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PARENTAL_CONTROLS)
public void setParentalControlsEnabled(boolean enabled) {
try {
mService.setParentalControlsEnabled(enabled, mUserId);
@@ -1292,6 +1294,7 @@ public final class TvInputManager {
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PARENTAL_CONTROLS)
public void addBlockedRating(@NonNull TvContentRating rating) {
Preconditions.checkNotNull(rating);
try {
@@ -1310,6 +1313,7 @@ public final class TvInputManager {
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PARENTAL_CONTROLS)
public void removeBlockedRating(@NonNull TvContentRating rating) {
Preconditions.checkNotNull(rating);
try {
@@ -1444,6 +1448,7 @@ public final class TvInputManager {
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.TV_INPUT_HARDWARE)
public List<TvInputHardwareInfo> getHardwareList() {
try {
return mService.getHardwareList();
@@ -1462,6 +1467,7 @@ public final class TvInputManager {
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.TV_INPUT_HARDWARE)
public Hardware acquireTvInputHardware(int deviceId, final HardwareCallback callback,
TvInputInfo info) {
try {
@@ -1488,6 +1494,7 @@ public final class TvInputManager {
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.TV_INPUT_HARDWARE)
public void releaseTvInputHardware(int deviceId, Hardware hardware) {
try {
mService.releaseTvInputHardware(deviceId, hardware.getInterface(), mUserId);