diff options
| author | Xin Li <delphij@google.com> | 2019-09-05 16:53:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-05 16:53:18 +0000 |
| commit | d7a8e234e9b94ff36cd271555a0bbf8a01a10932 (patch) | |
| tree | b6c98b0e3e76f797dbc57e77a8aac776ca1d1324 /src/com/android/settings/development/FileEncryptionPreferenceController.java | |
| parent | 1e53efc4c48ec80421bb0542b770332ab8efdab5 (diff) | |
| parent | 7195e05dfaf1c848a7af9b844cd8bd05e9c220fe (diff) | |
| download | packages_apps_Settings-d7a8e234e9b94ff36cd271555a0bbf8a01a10932.tar.gz packages_apps_Settings-d7a8e234e9b94ff36cd271555a0bbf8a01a10932.tar.bz2 packages_apps_Settings-d7a8e234e9b94ff36cd271555a0bbf8a01a10932.zip | |
Merge "DO NOT MERGE - Merge Android 10 into master"
Diffstat (limited to 'src/com/android/settings/development/FileEncryptionPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/development/FileEncryptionPreferenceController.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/development/FileEncryptionPreferenceController.java b/src/com/android/settings/development/FileEncryptionPreferenceController.java index a988fdd904..82a58bad8c 100644 --- a/src/com/android/settings/development/FileEncryptionPreferenceController.java +++ b/src/com/android/settings/development/FileEncryptionPreferenceController.java @@ -20,10 +20,10 @@ import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; import android.os.storage.IStorageManager; +import android.text.TextUtils; import android.sysprop.CryptoProperties; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; |