diff options
| author | 2015-12-09 22:51:43 +0000 | |
|---|---|---|
| committer | 2015-12-09 22:51:43 +0000 | |
| commit | 98cb23dccfb65ddd2802c49d8714979f7dbae1df (patch) | |
| tree | 5159f138d37965c9b3bd695b7bfe16f1f6f915a1 /tools | |
| parent | 863cf1572ebf12cb6ef3a8e5424b1348c4734b0a (diff) | |
| parent | e13529a4adb60e5a18c2e36ce6c5bf8f2d1db78f (diff) | |
Merge "Slight API renaming, better behavior."
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java | 8 |
1 files changed, 4 insertions, 4 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 bd5335ebb38d..b09a14fd1b39 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 @@ -1804,24 +1804,24 @@ public final class BridgeContext extends Context { } @Override - public Context createDeviceEncryptedContext(Context context) { + public Context createDeviceEncryptedStorageContext() { // pass return null; } @Override - public Context createCredentialEncryptedContext(Context context) { + public Context createCredentialEncryptedStorageContext() { // pass return null; } @Override - public boolean isDeviceEncrypted() { + public boolean isDeviceEncryptedStorage() { return false; } @Override - public boolean isCredentialEncrypted() { + public boolean isCredentialEncryptedStorage() { return false; } } |