diff options
| author | Jason Simmons <jsimmons@google.com> | 2011-11-10 14:29:46 -0800 |
|---|---|---|
| committer | Jason Simmons <jsimmons@google.com> | 2011-11-10 14:29:46 -0800 |
| commit | f0b82d61f50ab0d9bd2ab57b33bf8fabed401c73 (patch) | |
| tree | a8cce7cb6a3cafd49581c7d9b0dc08ea939a8067 /core/java/android/provider | |
| parent | 8d9c011eebbd8fc39e5129985a4b3ff8c7bc016f (diff) | |
| parent | faa81c82103e89a3f2c86c4e737d9beb7e557402 (diff) | |
| download | frameworks_base-f0b82d61f50ab0d9bd2ab57b33bf8fabed401c73.zip frameworks_base-f0b82d61f50ab0d9bd2ab57b33bf8fabed401c73.tar.gz frameworks_base-f0b82d61f50ab0d9bd2ab57b33bf8fabed401c73.tar.bz2 | |
resolved conflicts for merge of faa81c82 to ics-aah
Change-Id: I7464f16940058cc9b5a3dba5cb839bc67129009e
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 10 | ||||
| -rwxr-xr-x | core/java/android/provider/Telephony.java | 10 |
2 files changed, 1 insertions, 19 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 351841e..13a95e3 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4089,13 +4089,6 @@ public final class Settings { "contacts_preauth_uri_expiration"; /** - * Whether the Messaging app posts notifications. - * 0=disabled. 1=enabled. - */ - public static final String MESSAGING_APP_NOTIFICATIONS = "messaging_app_notifications"; - - - /** * This are the settings to be backed up. * * NOTE: Settings are backed up and restored in the order they appear @@ -4132,8 +4125,7 @@ public final class Settings { MOUNT_UMS_NOTIFY_ENABLED, UI_NIGHT_MODE, LOCK_SCREEN_OWNER_INFO, - LOCK_SCREEN_OWNER_INFO_ENABLED, - MESSAGING_APP_NOTIFICATIONS + LOCK_SCREEN_OWNER_INFO_ENABLED }; /** diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index 8eb9da1..0e6d07d 100755 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -1838,15 +1838,5 @@ public final class Telephony { public static final String EXTRA_PLMN = "plmn"; public static final String EXTRA_SHOW_SPN = "showSpn"; public static final String EXTRA_SPN = "spn"; - - /** - * Activity Action: Shows a dialog to turn off Messaging app notification. - * <p>Input: Nothing. - * <p>Output: Nothing. - */ - @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - public static final String ACTION_MESSAGING_APP_NOTIFICATIONS = - "android.provider.Telephony.MESSAGING_APP_NOTIFICATIONS"; - } } |