summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-06-24 15:23:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-24 15:23:59 -0700
commit2eb12a47224f1617787c09824107ac6bc22f9b3e (patch)
tree4ac421d81dc5206a5782f50688e2faf7201dc9ba /opengl
parent95d26de9e048ef0342e3aed15a4d5d5c8a6e8493 (diff)
parent01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301 (diff)
downloadframeworks_base-2eb12a47224f1617787c09824107ac6bc22f9b3e.zip
frameworks_base-2eb12a47224f1617787c09824107ac6bc22f9b3e.tar.gz
frameworks_base-2eb12a47224f1617787c09824107ac6bc22f9b3e.tar.bz2
am 01e4cfc4: Some ActivityThread/ActivityManager cleanup.
Merge commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301' into gingerbread-plus-aosp * commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301': Some ActivityThread/ActivityManager cleanup.
Diffstat (limited to 'opengl')
-rw-r--r--opengl/java/com/google/android/gles_jni/GLImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/java/com/google/android/gles_jni/GLImpl.java b/opengl/java/com/google/android/gles_jni/GLImpl.java
index 30b9325..090c0cb 100644
--- a/opengl/java/com/google/android/gles_jni/GLImpl.java
+++ b/opengl/java/com/google/android/gles_jni/GLImpl.java
@@ -19,7 +19,7 @@
package com.google.android.gles_jni;
-import android.app.ActivityThread;
+import android.app.AppGlobals;
import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageManager;
import android.os.Build;
@@ -65,7 +65,7 @@ public class GLImpl implements GL10, GL10Ext, GL11, GL11Ext, GL11ExtensionPack {
private static boolean allowIndirectBuffers(String appName) {
boolean result = false;
int version = 0;
- IPackageManager pm = ActivityThread.getPackageManager();
+ IPackageManager pm = AppGlobals.getPackageManager();
try {
ApplicationInfo applicationInfo = pm.getApplicationInfo(appName, 0);
if (applicationInfo != null) {