Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename PLAY_STORE_AVAILABILITY with PHONE_PLAY_STORE_AVAILABILITY.

Browse Source 
Bug: 175820762
Test: manual test and unit test
Change-Id: I5a7bb8ba50a14e7589e8cf771545aeaf4ee9362e
(cherry picked from commit e8aa4baedfaa447da9f9211b07e495759b05216b)
This commit is contained in:
Josh Yang
2020-12-16 17:34:05 -08:00
committed by Yeabkal Assegid Wubshit
parent 95b8d682d3
commit aa5d333194
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/provider/Settings.java
View File

@@ -16307,18 +16307,19 @@ public final class Settings {
public static final int RETAIL_MODE_RETAIL = 1;
/**
* The play store availability.
* The play store availability on companion phone.
* @hide
*/
public static final String PLAY_STORE_AVAILABILITY = "play_store_availability";
public static final String PHONE_PLAY_STORE_AVAILABILITY =
"phone_play_store_availability";
// Possible play store availability states
// Possible phone play store availability states
/** @hide */
public static final int PLAY_STORE_AVAILABILITY_UNKNOWN = 0;
public static final int PHONE_PLAY_STORE_AVAILABILITY_UNKNOWN = 0;
/** @hide */
public static final int PLAY_STORE_AVAILABLE = 1;
public static final int PHONE_PLAY_STORE_AVAILABLE = 1;
/** @hide */
public static final int PLAY_STORE_UNAVAILABLE = 2;
public static final int PHONE_PLAY_STORE_UNAVAILABLE = 2;
/**
* Whether the bug report is enabled.

8
packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java
View File

@@ -160,12 +160,12 @@ public class GlobalSettingsValidators {
String.valueOf(Global.Wearable.RETAIL_MODE_RETAIL)
}));
VALIDATORS.put(
Global.Wearable.PLAY_STORE_AVAILABILITY,
Global.Wearable.PHONE_PLAY_STORE_AVAILABILITY,
new DiscreteValueValidator(
new String[] {
String.valueOf(Global.Wearable.PLAY_STORE_AVAILABLE),
String.valueOf(Global.Wearable.PLAY_STORE_UNAVAILABLE),
String.valueOf(Global.Wearable.PLAY_STORE_AVAILABILITY_UNKNOWN)
String.valueOf(Global.Wearable.PHONE_PLAY_STORE_AVAILABLE),
String.valueOf(Global.Wearable.PHONE_PLAY_STORE_UNAVAILABLE),
String.valueOf(Global.Wearable.PHONE_PLAY_STORE_AVAILABILITY_UNKNOWN)
}));
VALIDATORS.put(
Global.Wearable.BUG_REPORT,

4
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -5215,8 +5215,8 @@ public class SettingsProvider extends ContentProvider {
initGlobalSettingsDefaultValForWearLocked(
Global.Wearable.RETAIL_MODE, Global.Wearable.RETAIL_MODE_CONSUMER);
initGlobalSettingsDefaultValForWearLocked(
Global.Wearable.PLAY_STORE_AVAILABILITY,
Global.Wearable.PLAY_STORE_AVAILABILITY_UNKNOWN);
Global.Wearable.PHONE_PLAY_STORE_AVAILABILITY,
Global.Wearable.PHONE_PLAY_STORE_AVAILABILITY_UNKNOWN);
initGlobalSettingsDefaultValForWearLocked(
Global.Wearable.BUG_REPORT,
"user".equals(Build.TYPE) // is user build?

2
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -599,7 +599,7 @@ public class SettingsBackupTest {
Settings.Global.Wearable.DEFAULT_VIBRATION,
Settings.Global.Wearable.OBTAIN_PAIRED_DEVICE_LOCATION,
Settings.Global.Wearable.RETAIL_MODE,
Settings.Global.Wearable.PLAY_STORE_AVAILABILITY,
Settings.Global.Wearable.PHONE_PLAY_STORE_AVAILABILITY,
Settings.Global.Wearable.BUG_REPORT,
Settings.Global.Wearable.SMART_ILLUMINATE_ENABLED,
Settings.Global.Wearable.CLOCKWORK_AUTO_TIME,