diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-11-21 01:52:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-21 01:52:23 +0000 |
| commit | f8c36914250a2274ce20102b350915cd6ffaa6eb (patch) | |
| tree | 89cf0a752879d01c8ad5b5b607612314092a9c6f /tools | |
| parent | 51041cb7daa74971b6aff1a1370fbb4859902112 (diff) | |
| parent | 377d6f00dc2ab42df501fd12b23e1dab54cea6b7 (diff) | |
| download | frameworks_base-f8c36914250a2274ce20102b350915cd6ffaa6eb.zip frameworks_base-f8c36914250a2274ce20102b350915cd6ffaa6eb.tar.gz frameworks_base-f8c36914250a2274ce20102b350915cd6ffaa6eb.tar.bz2 | |
am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev
automerge: 377d6f0
* commit '377d6f00dc2ab42df501fd12b23e1dab54cea6b7':
Fix issue with call backs from media process.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java | 2 | ||||
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java index 89288bf..e4cbb2f 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java @@ -90,7 +90,7 @@ public final class BridgeContentProvider implements IContentProvider { @Override public ParcelFileDescriptor openFile( - String callingPackage, Uri arg0, String arg1, ICancellationSignal signal) + String callingPackage, Uri arg0, String arg1, ICancellationSignal signal, IBinder token) throws RemoteException, FileNotFoundException { // TODO Auto-generated method stub return null; 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 aeb70e9..2c3736f 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 @@ -16,6 +16,7 @@ package com.android.layoutlib.bridge.android; +import android.os.IBinder; import com.android.annotations.Nullable; import com.android.ide.common.rendering.api.ILayoutPullParser; import com.android.ide.common.rendering.api.IProjectCallback; @@ -938,12 +939,24 @@ public final class BridgeContext extends Context { } @Override + public int checkPermission(String arg0, int arg1, int arg2, IBinder arg3) { + // pass + return 0; + } + + @Override public int checkUriPermission(Uri arg0, int arg1, int arg2, int arg3) { // pass return 0; } @Override + public int checkUriPermission(Uri arg0, int arg1, int arg2, int arg3, IBinder arg4) { + // pass + return 0; + } + + @Override public int checkUriPermission(Uri arg0, String arg1, String arg2, int arg3, int arg4, int arg5) { // pass |