diff options
| author | Alexander Ray <aray@google.com> | 2013-09-11 19:05:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-11 19:05:38 +0000 |
| commit | 7563d42331ed7df7f026c8921ae990ce2fca9efd (patch) | |
| tree | 04ec8a1746321f55edf783bb4bceb6485879dd63 /core/java/android/app/ContextImpl.java | |
| parent | f702286c94f0df9fc147135c19f12ef34e8594c9 (diff) | |
| parent | 51e95df8f24e9ea30775686b9e324b9a671213dc (diff) | |
| download | frameworks_base-7563d42331ed7df7f026c8921ae990ce2fca9efd.zip frameworks_base-7563d42331ed7df7f026c8921ae990ce2fca9efd.tar.gz frameworks_base-7563d42331ed7df7f026c8921ae990ce2fca9efd.tar.bz2 | |
Merge "Add consumer IR framework" into klp-dev
Diffstat (limited to 'core/java/android/app/ContextImpl.java')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index fe8c506..8e9f3bb 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -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) { |