Merge "Fix in layoutlib due to some changes in the frameworks."
diff --git a/core/java/android/speech/RecognitionManager.java b/core/java/android/speech/RecognitionManager.java
index edb7067..74b9fce 100644
--- a/core/java/android/speech/RecognitionManager.java
+++ b/core/java/android/speech/RecognitionManager.java
@@ -221,7 +221,7 @@
if (mConnection == null) { // first time connection
mConnection = new Connection();
- Intent serviceIntent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
+ Intent serviceIntent = new Intent(RecognitionService.SERVICE_INTERFACE);
String serviceComponent = Settings.Secure.getString(mContext.getContentResolver(),
Settings.Secure.VOICE_RECOGNITION_SERVICE);
diff --git a/core/java/android/speech/RecognitionService.java b/core/java/android/speech/RecognitionService.java
index 5de6cf0..941b70c 100644
--- a/core/java/android/speech/RecognitionService.java
+++ b/core/java/android/speech/RecognitionService.java
@@ -30,8 +30,8 @@
/**
* This class provides a base class for recognition service implementations. This class should be
- * extended only in case you wish to implement a new speech recognizer. Please not that the
- * implementation of this service is state-less.
+ * extended only in case you wish to implement a new speech recognizer. Please note that the
+ * implementation of this service is stateless.
*/
public abstract class RecognitionService extends Service {
/**
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp
index 2a0ccfb..e94aece 100644
--- a/libs/rs/rsContext.cpp
+++ b/libs/rs/rsContext.cpp
@@ -19,7 +19,7 @@
#include "rsThreadIO.h"
#include <ui/FramebufferNativeWindow.h>
#include <ui/EGLUtils.h>
-#include <surfaceflinger/Surface.h>
+#include <ui/egl/android_natives.h>
#include <sys/types.h>
#include <sys/resource.h>
@@ -461,7 +461,7 @@
objDestroyOOBDestroy();
}
-void Context::setSurface(uint32_t w, uint32_t h, Surface *sur)
+void Context::setSurface(uint32_t w, uint32_t h, android_native_window_t *sur)
{
rsAssert(mIsGraphicsContext);
@@ -859,7 +859,7 @@
void rsi_ContextSetSurface(Context *rsc, uint32_t w, uint32_t h, void *sur)
{
- rsc->setSurface(w, h, (Surface *)sur);
+ rsc->setSurface(w, h, (android_native_window_t *)sur);
}
void rsi_ContextSetPriority(Context *rsc, int32_t p)
diff --git a/libs/rs/rsContext.h b/libs/rs/rsContext.h
index caf9728..03e65f1 100644
--- a/libs/rs/rsContext.h
+++ b/libs/rs/rsContext.h
@@ -41,12 +41,11 @@
#include "rsgApiStructs.h"
#include "rsLocklessFifo.h"
+#include <ui/egl/android_natives.h>
// ---------------------------------------------------------------------------
namespace android {
-class Surface;
-
namespace renderscript {
class Context
@@ -99,7 +98,7 @@
void pause();
void resume();
- void setSurface(uint32_t w, uint32_t h, Surface *sur);
+ void setSurface(uint32_t w, uint32_t h, android_native_window_t *sur);
void setPriority(int32_t p);
void assignName(ObjectBase *obj, const char *name, uint32_t len);
@@ -239,7 +238,7 @@
static void * threadProc(void *);
- Surface *mWndSurface;
+ android_native_window_t *mWndSurface;
Vector<ObjectBase *> mNames;
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 4e1e0a2..b26607f4 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -38,6 +38,7 @@
import android.os.Environment;
import android.os.SystemProperties;
import android.provider.Settings;
+import android.speech.RecognitionService;
import android.speech.RecognizerIntent;
import android.text.TextUtils;
import android.util.Config;
@@ -996,7 +997,7 @@
String selectedService = null;
List<ResolveInfo> availableRecognitionServices =
mContext.getPackageManager().queryIntentServices(
- new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH), 0);
+ new Intent(RecognitionService.SERVICE_INTERFACE), 0);
int numAvailable = availableRecognitionServices.size();
if (numAvailable == 0) {