summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorErik Gilling <konkers@android.com>2013-06-26 11:06:51 -0700
committerAlex Ray <aray@google.com>2013-09-11 09:52:47 -0700
commit51e95df8f24e9ea30775686b9e324b9a671213dc (patch)
tree15f7e3d722629532c612d10bce41d496729a3c27 /api
parent2f1ef77c07da2ed7168f75551dd632026b20f8cc (diff)
downloadframeworks_base-51e95df8f24e9ea30775686b9e324b9a671213dc.zip
frameworks_base-51e95df8f24e9ea30775686b9e324b9a671213dc.tar.gz
frameworks_base-51e95df8f24e9ea30775686b9e324b9a671213dc.tar.bz2
Add consumer IR framework
Change-Id: I786c00db0cce61ef75e4edc24e90f2cdcba6dbfb
Diffstat (limited to 'api')
-rw-r--r--api/current.txt14
1 files changed, 14 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 3c4555f..f17a1ca 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -129,6 +129,7 @@ package android {
field public static final java.lang.String SUBSCRIBED_FEEDS_READ = "android.permission.SUBSCRIBED_FEEDS_READ";
field public static final java.lang.String SUBSCRIBED_FEEDS_WRITE = "android.permission.SUBSCRIBED_FEEDS_WRITE";
field public static final java.lang.String SYSTEM_ALERT_WINDOW = "android.permission.SYSTEM_ALERT_WINDOW";
+ field public static final java.lang.String TRANSMIT_IR = "android.permission.TRANSMIT_IR";
field public static final java.lang.String UPDATE_DEVICE_STATS = "android.permission.UPDATE_DEVICE_STATS";
field public static final java.lang.String USE_CREDENTIALS = "android.permission.USE_CREDENTIALS";
field public static final java.lang.String USE_SIP = "android.permission.USE_SIP";
@@ -5970,6 +5971,7 @@ package android.content {
field public static final java.lang.String CAPTIONING_SERVICE = "captioning";
field public static final java.lang.String CLIPBOARD_SERVICE = "clipboard";
field public static final java.lang.String CONNECTIVITY_SERVICE = "connectivity";
+ field public static final java.lang.String CONSUMER_IR_SERVICE = "consumer_ir";
field public static final int CONTEXT_IGNORE_SECURITY = 2; // 0x2
field public static final int CONTEXT_INCLUDE_CODE = 1; // 0x1
field public static final int CONTEXT_RESTRICTED = 4; // 0x4
@@ -10628,6 +10630,18 @@ package android.hardware {
field public int width;
}
+ public final class ConsumerIrManager {
+ method public android.hardware.ConsumerIrManager.CarrierFrequencyRange[] getCarrierFrequencies();
+ method public boolean hasIrEmitter();
+ method public void transmit(int, int[]);
+ }
+
+ public final class ConsumerIrManager.CarrierFrequencyRange {
+ ctor public ConsumerIrManager.CarrierFrequencyRange(int, int);
+ method public int getMaxFrequency();
+ method public int getMinFrequency();
+ }
+
public abstract interface FlushCompleteListener {
method public abstract void onFlushCompleted(android.hardware.Sensor);
}