summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2013-09-11 10:49:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-11 10:49:10 -0700
commit03422d262685f1b665e736c291f9fd01124c2416 (patch)
tree56118f98b03bdeaf7f00b5f89347d8d6286d530c /tools
parentabc7f5438c2b63864ba964f155d1efe7ea006803 (diff)
parente9aad4ae31caeb00f95d83119c2020f4cb5f345c (diff)
downloadframeworks_base-03422d262685f1b665e736c291f9fd01124c2416.zip
frameworks_base-03422d262685f1b665e736c291f9fd01124c2416.tar.gz
frameworks_base-03422d262685f1b665e736c291f9fd01124c2416.tar.bz2
am e9aad4ae: Merge "Fix issue #10688644: Java crash in com.android.phone:" into klp-dev
* commit 'e9aad4ae31caeb00f95d83119c2020f4cb5f345c': Fix issue #10688644: Java crash in com.android.phone:
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
index a1f2697..b9294ab 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
@@ -1090,6 +1090,12 @@ public final class BridgeContext extends Context {
}
@Override
+ public String getOpPackageName() {
+ // pass
+ return null;
+ }
+
+ @Override
public ApplicationInfo getApplicationInfo() {
return mApplicationInfo;
}