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

Remove OPTED_OUT Secure Setting based on API Council feedback.

Browse Source 
Bug:129768185
Test: manual
Change-Id: I51d47142cfb2abeb17d6ad5e99b8f7d1ea585fc7
This commit is contained in:
Anthony Tripaldi
2019-04-05 16:08:56 -04:00
parent 28fd318974
commit 8c1ebec4f1
4 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -6099,7 +6099,6 @@ package android.provider {
field public static final String LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS = "lock_screen_allow_private_notifications";
field public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = "lock_screen_show_notifications";
field public static final String ODI_CAPTIONS_ENABLED = "odi_captions_enabled";
field public static final String ODI_CAPTIONS_OPTED_OUT = "odi_captions_opted_out";
field public static final String THEME_CUSTOMIZATION_OVERLAY_PACKAGES = "theme_customization_overlay_packages";
field public static final String USER_SETUP_COMPLETE = "user_setup_complete";
field public static final int USER_SETUP_PERSONALIZATION_COMPLETE = 10; // 0xa

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

@@ -5661,17 +5661,6 @@ public final class Settings {
private static final Validator ODI_CAPTIONS_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR;
/**
* Setting to indicate that on device captions cannot be shown because the app
* which is currently playing media had opted out.
*
* @hide
*/
@SystemApi
public static final String ODI_CAPTIONS_OPTED_OUT = "odi_captions_opted_out";
private static final Validator ODI_CAPTIONS_OPTED_OUT_VALIDATOR = BOOLEAN_VALIDATOR;
/**
* On Android 8.0 (API level 26) and higher versions of the platform,
* a 64-bit number (expressed as a hexadecimal string), unique to
@@ -8998,7 +8987,6 @@ public final class Settings {
VALIDATORS.put(SILENCE_CALL_GESTURE_COUNT, SILENCE_GESTURE_COUNT_VALIDATOR);
VALIDATORS.put(SILENCE_NOTIFICATION_GESTURE_COUNT, SILENCE_GESTURE_COUNT_VALIDATOR);
VALIDATORS.put(ODI_CAPTIONS_ENABLED, ODI_CAPTIONS_ENABLED_VALIDATOR);
VALIDATORS.put(ODI_CAPTIONS_OPTED_OUT, ODI_CAPTIONS_OPTED_OUT_VALIDATOR);
}
/**

1
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -650,7 +650,6 @@ public class SettingsBackupTest {
Settings.Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME,
Settings.Secure.NUM_ROTATION_SUGGESTIONS_ACCEPTED,
Settings.Secure.ODI_CAPTIONS_ENABLED,
Settings.Secure.ODI_CAPTIONS_OPTED_OUT,
Settings.Secure.PACKAGE_VERIFIER_STATE,
Settings.Secure.PACKAGE_VERIFIER_USER_CONSENT,
Settings.Secure.PARENTAL_CONTROL_LAST_UPDATE,

5
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
View File

@@ -284,9 +284,8 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
@Override
public boolean isCaptionStreamOptedOut() {
int currentValue = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ODI_CAPTIONS_OPTED_OUT, 0);
return currentValue == 1;
// TODO(b/129768185): Removing secure setting, to be replaced by sound event listener
return false;
}
public void getCaptionsComponentState(boolean fromTooltip) {