diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/LoadedApk.java | 4 | ||||
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 12 | ||||
| -rw-r--r-- | core/java/android/bluetooth/BluetoothAdapter.java | 5 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 9 |
4 files changed, 22 insertions, 8 deletions
diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index d143b86..aa98e97 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -360,7 +360,6 @@ public final class LoadedApk { mClassLoader = ApplicationLoaders.getDefault().getClassLoader(zip, lib, mBaseClassLoader); - initializeJavaContextClassLoader(); StrictMode.setThreadPolicy(oldPolicy); } else { @@ -552,6 +551,9 @@ public final class LoadedApk { try { java.lang.ClassLoader cl = getClassLoader(); + if (!mPackageName.equals("android")) { + initializeJavaContextClassLoader(); + } ContextImpl appContext = ContextImpl.createAppContext(mActivityThread, this); app = mActivityThread.mInstrumentation.newApplication( cl, appClass, appContext); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 8917928..a30ae57 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1341,7 +1341,7 @@ public class DevicePolicyManager { * {@link DeviceAdminInfo#USES_POLICY_RESET_PASSWORD} to be able to call * this method; if it has not, a security exception will be thrown. * - * Can not be called from a managed profile. + * <p>Calling this from a managed profile will throw a security exception. * * @param password The new password for the user. * @param flags May be 0 or {@link #RESET_PASSWORD_REQUIRE_ENTRY}. @@ -1887,8 +1887,8 @@ public class DevicePolicyManager { /** * Called by an application that is administering the device to disable all cameras - * on the device. After setting this, no applications will be able to access any cameras - * on the device. + * on the device, for this user. After setting this, no applications running as this user + * will be able to access any cameras on the device. * * <p>The calling device admin must have requested * {@link DeviceAdminInfo#USES_POLICY_DISABLE_CAMERA} to be able to call @@ -1908,8 +1908,8 @@ public class DevicePolicyManager { } /** - * Determine whether or not the device's cameras have been disabled either by the current - * admin, if specified, or all admins. + * Determine whether or not the device's cameras have been disabled for this user, + * either by the current admin, if specified, or all admins. * @param admin The name of the admin component to check, or null to check if any admins * have disabled the camera */ @@ -2018,6 +2018,8 @@ public class DevicePolicyManager { * {@link DeviceAdminInfo#USES_POLICY_DISABLE_KEYGUARD_FEATURES} to be able to call * this method; if it has not, a security exception will be thrown. * + * <p>Calling this from a managed profile will throw a security exception. + * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param which {@link #KEYGUARD_DISABLE_FEATURES_NONE} (default), * {@link #KEYGUARD_DISABLE_WIDGETS_ALL}, {@link #KEYGUARD_DISABLE_SECURE_CAMERA}, diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index f0b609a..5564af7 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -454,8 +454,9 @@ public final class BluetoothAdapter { } /** - * Returns a {@link BluetoothLeAdvertiser} object for Bluetooth LE Advertising operations, or - * null if Bluetooth LE Advertising is not support on this device. + * Returns a {@link BluetoothLeAdvertiser} object for Bluetooth LE Advertising operations. + * Will return null if Bluetooth is turned off or if Bluetooth LE Advertising is not + * supported on this device. * <p> * Use {@link #isMultipleAdvertisementSupported()} to check whether LE Advertising is supported * on this device before calling this method. diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index e40c88f..79e84d9 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6570,6 +6570,15 @@ public final class Settings { public static final String NETWORK_SCORING_PROVISIONED = "network_scoring_provisioned"; /** + * Whether the user wants to be prompted for password to decrypt the device on boot. + * This only matters if the storage is encrypted. + * <p> + * Type: int (0 for false, 1 for true) + * @hide + */ + public static final String REQUIRE_PASSWORD_TO_DECRYPT = "require_password_to_decrypt"; + + /** * Settings to backup. This is here so that it's in the same place as the settings * keys and easy to update. * |