diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-27 17:21:27 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-27 17:21:27 +0000 |
commit | 4499718cc171a6c79e03fc53e139efaf4d8ba6f8 (patch) | |
tree | c830e73232470fc7498ffe3853c0428274e2194f /java/com/android/dialer/util | |
parent | f60c5384f34660ae03ae3c15183980dfb8219ba9 (diff) | |
parent | 5d8ed9309625302dee3407b320a52f2b7f30227f (diff) |
Merge changes I6e17c1cc,If00f7e91,Ia89d5d85
* changes:
Fix HOLD option not displayed in voice calls in CDMA + GSM.
Use string concatenation for CREATE_TABLE_SQL instead of StringBuilder()
Move the functionality of DialerUtils#getDefaultSharedPreferenceForDeviceProtectedStorageContext(Context) to StorageComponent.
Diffstat (limited to 'java/com/android/dialer/util')
-rw-r--r-- | java/com/android/dialer/util/DialerUtils.java | 22 | ||||
-rw-r--r-- | java/com/android/dialer/util/PermissionsUtil.java | 7 |
2 files changed, 5 insertions, 24 deletions
diff --git a/java/com/android/dialer/util/DialerUtils.java b/java/com/android/dialer/util/DialerUtils.java index f38c650d3..7f7b9da74 100644 --- a/java/com/android/dialer/util/DialerUtils.java +++ b/java/com/android/dialer/util/DialerUtils.java @@ -21,14 +21,10 @@ import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.content.Intent; -import android.content.SharedPreferences; import android.graphics.Point; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.os.Bundle; -import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; import android.telecom.TelecomManager; import android.telephony.TelephonyManager; import android.text.BidiFormatter; @@ -36,9 +32,7 @@ import android.text.TextDirectionHeuristics; import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.Toast; -import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; -import com.android.dialer.storage.StorageComponent; import com.android.dialer.telecom.TelecomUtil; import java.io.File; import java.util.Iterator; @@ -223,20 +217,4 @@ public class DialerUtils { } return new File(parentDir, String.valueOf(fileId)); } - - /** - * Returns default preference for context accessing device protected storage. This is used when - * directBoot is enabled (before device unlocked after boot) since the default shared preference - * used normally is not available at this moment for N devices. Returns regular default shared - * preference for pre-N devices. - */ - @NonNull - public static SharedPreferences getDefaultSharedPreferenceForDeviceProtectedStorageContext( - @NonNull Context context) { - Assert.isNotNull(context); - if (ContextCompat.isDeviceProtectedStorage(context)) { - return PreferenceManager.getDefaultSharedPreferences(context); - } - return StorageComponent.get(context.getApplicationContext()).deviceProtectedSharedPreferences(); - } } diff --git a/java/com/android/dialer/util/PermissionsUtil.java b/java/com/android/dialer/util/PermissionsUtil.java index 02ea91093..012b83ff1 100644 --- a/java/com/android/dialer/util/PermissionsUtil.java +++ b/java/com/android/dialer/util/PermissionsUtil.java @@ -40,6 +40,7 @@ import android.support.v4.content.ContextCompat; import android.support.v4.content.LocalBroadcastManager; import android.widget.Toast; import com.android.dialer.common.LogUtil; +import com.android.dialer.storage.StorageComponent; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -221,7 +222,8 @@ public class PermissionsUtil { * @return true if we've already shown the camera privacy toast. */ public static boolean hasCameraPrivacyToastShown(@NonNull Context context) { - return DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context) + return StorageComponent.get(context) + .unencryptedSharedPrefs() .getBoolean(PREFERENCE_CAMERA_ALLOWED_BY_USER, false); } @@ -232,7 +234,8 @@ public class PermissionsUtil { } public static void setCameraPrivacyToastShown(@NonNull Context context) { - DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context) + StorageComponent.get(context) + .unencryptedSharedPrefs() .edit() .putBoolean(PREFERENCE_CAMERA_ALLOWED_BY_USER, true) .apply(); |