From e13529a4adb60e5a18c2e36ce6c5bf8f2d1db78f Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Wed, 9 Dec 2015 14:15:27 -0700 Subject: Slight API renaming, better behavior. Rename APIs to reflect that they're storage-related. Also move credential-storage APIs to be system API. Return a null Context when device-encrypted storage isn't supported. This is the easiest way to keep legacy apps working when upgrading from M to N. Reduce strictness of path checking so we don't crash when working with special packages like "android". Bug: 22358539, 26104027 Change-Id: I38c24fc003488186210a6ae3b64270f86e1efe56 --- .../src/com/android/layoutlib/bridge/android/BridgeContext.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools') 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; } } -- cgit v1.2.3-59-g8ed1b