am b0049151: am 7563d423: Merge "Add consumer IR framework" into klp-dev (4c980cc6) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,7 @@ LOCAL_SRC_FILES += \
		core/java/android/hardware/ICameraServiceListener.aidl \
		core/java/android/hardware/ICamera.aidl \
		core/java/android/hardware/ICameraClient.aidl \
		core/java/android/hardware/IConsumerIrService.aidl \
		core/java/android/hardware/IProCameraUser.aidl \
		core/java/android/hardware/IProCameraCallbacks.aidl \
		core/java/android/hardware/camera2/ICameraDeviceUser.aidl \

api/current.txt

+14 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,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";
		@@ -5989,6 +5990,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
		@@ -10669,6 +10671,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);
		}

core/java/android/app/ContextImpl.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ import android.database.sqlite.SQLiteDatabase;
		import android.database.sqlite.SQLiteDatabase.CursorFactory;
		import android.graphics.Bitmap;
		import android.graphics.drawable.Drawable;
		import android.hardware.ConsumerIrManager;
		import android.hardware.ISerialManager;
		import android.hardware.SerialManager;
		import android.hardware.SystemSensorManager;
		@@ -580,6 +581,11 @@ class ContextImpl extends Context {
		return new PrintManager(ctx.getOuterContext(), service, UserHandle.myUserId(),
		UserHandle.getAppId(Process.myUid()));
		}});

		registerService(CONSUMER_IR_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		return new ConsumerIrManager(ctx);
		}});
		}

		static ContextImpl getImpl(Context context) {

core/java/android/content/Context.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -2400,6 +2400,16 @@ public abstract class Context {
		*/
		public static final String PRINT_SERVICE = "print";

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.hardware.ConsumerIrManager} for transmitting infrared
		* signals from the device.
		*
		* @see #getSystemService
		* @see android.hardware.ConsumerIrManager
		*/
		public static final String CONSUMER_IR_SERVICE = "consumer_ir";

		/**
		* Determine whether the given permission is allowed for a particular
		* process and user ID running in the system.

core/java/android/hardware/ConsumerIrManager.java

0 → 100644

+153 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.hardware;

		import android.content.Context;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.util.Log;

		/**
		* Class that operates consumer infrared on the device.
		*
		* <p>
		* To obtain an instance of the system infrared transmitter, call
		* {@link Context#getSystemService} with {@link Context#CONSUMER_IR} as the argument.
		* </p>
		*/
		public final class ConsumerIrManager {
		private static final String TAG = "ConsumerIr";

		private final String mPackageName;
		private final IConsumerIrService mService;

		/**
		* @hide to prevent subclassing from outside of the framework
		*/
		public ConsumerIrManager(Context context) {
		mPackageName = context.getPackageName();
		mService = IConsumerIrService.Stub.asInterface(
		ServiceManager.getService(Context.CONSUMER_IR_SERVICE));
		}

		/**
		* Check whether the device has an infrared emitter.
		*
		* @return true if the device has an infrared emitter, else false.
		*/
		public boolean hasIrEmitter() {
		if (mService == null) {
		Log.w(TAG, "no consumer ir service.");
		return false;
		}

		try {
		return mService.hasIrEmitter();
		} catch (RemoteException e) {
		}
		return false;
		}

		/**
		* Tansmit and infrared pattern
		* <p>
		* This method is synchronous; when it returns the pattern has
		* been transmitted. Only patterns shorter than 2 seconds will
		* be transmitted.
		* </p>
		*
		* @param carrierFrequency The IR carrier frequency in Hertz.
		* @param pattern The alternating on/off pattern in microseconds to transmit.
		*/
		public void transmit(int carrierFrequency, int[] pattern) {
		if (mService == null) {
		Log.w(TAG, "failed to transmit; no consumer ir service.");
		return;
		}

		try {
		mService.transmit(mPackageName, carrierFrequency, pattern);
		} catch (RemoteException e) {
		Log.w(TAG, "failed to transmit.", e);
		}
		}

		/**
		* Represents a range of carrier frequencies (inclusive) on which the
		* infrared transmitter can transmit
		*/
		public final class CarrierFrequencyRange {
		private final int mMinFrequency;
		private final int mMaxFrequency;

		/**
		* Create a segment of a carrier frequency range.
		*
		* @param min The minimum transmittable frequency in this range segment.
		* @param max The maximum transmittable frequency in this range segment.
		*/
		public CarrierFrequencyRange(int min, int max) {
		mMinFrequency = min;
		mMaxFrequency = max;
		}

		/**
		* Get the minimum (inclusive) frequency in this range segment.
		*/
		public int getMinFrequency() {
		return mMinFrequency;
		}

		/**
		* Get the maximum (inclusive) frequency in this range segment.
		*/
		public int getMaxFrequency() {
		return mMaxFrequency;
		}
		};

		/**
		* Query the infrared transmitter's supported carrier frequencies
		*
		* @return an array of {@link #CarrierFreqRange} objects representing
		* the ranges that the transmitter can support, or null if there was
		* an error communicating with the Consumer IR Service.
		*/
		public CarrierFrequencyRange[] getCarrierFrequencies() {
		if (mService == null) {
		Log.w(TAG, "no consumer ir service.");
		return null;
		}

		try {
		int[] freqs = mService.getCarrierFrequencies();
		if (freqs.length % 2 != 0) {
		Log.w(TAG, "consumer ir service returned an uneven number of frequencies.");
		return null;
		}
		CarrierFrequencyRange[] range = new CarrierFrequencyRange[freqs.length / 2];

		for (int i = 0; i < freqs.length; i += 2) {
		range[i / 2] = new CarrierFrequencyRange(freqs[i], freqs[i+1]);
		}
		return range;
		} catch (RemoteException e) {
		}
		return null;
		}

		}