Merge "Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev" into stage-aosp-master
This commit is contained in:
committed by
Android (Google) Code Review
commit
bfddb8cce7
@@ -8146,6 +8146,8 @@ public final class Settings {
|
|||||||
VOLUME_HUSH_GESTURE,
|
VOLUME_HUSH_GESTURE,
|
||||||
MANUAL_RINGER_TOGGLE_COUNT,
|
MANUAL_RINGER_TOGGLE_COUNT,
|
||||||
HUSH_GESTURE_USED,
|
HUSH_GESTURE_USED,
|
||||||
|
LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
|
||||||
|
LOCK_SCREEN_SHOW_NOTIFICATIONS,
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user