commit 994da2ad3242407fd822e6b35e3d302a3667d9c3
author Tom Taylor <tomtaylor@google.com> Thu Nov 10 11:17:38 2011 -0800
committer Tom Taylor <tomtaylor@google.com> Thu Nov 10 11:17:38 2011 -0800
tree bfa07f7cb460593e29ab3acdc6a76270ce8d5b92
parent 843e04d977fd348ed474da1d3c6a62e7dc837444

Revert "Add new secure setting for controlling Messaging notifications"

This reverts commit 03da2f00aac04e6565a02cf5a9bf6bb1ec926930.

 Committer: Tom Taylor <tomtaylor@google.com>

 On branch revertsetting
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   api/current.txt
	modified:   core/java/android/provider/Settings.java
	modified:   core/java/android/provider/Telephony.java
	modified:   packages/SettingsProvider/res/values/defaults.xml
	modified:   packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

We've decided not to disable messaging notifications with a secure setting.
Instead, all the work will be done within the messaging app itself.

Change-Id: Icde6894e76da1007b6026c8ec7dc56e488453c06

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 769776e..b032169 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -4077,13 +4077,6 @@
                 "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
@@ -4120,8 +4113,7 @@
             MOUNT_UMS_NOTIFY_ENABLED,
             UI_NIGHT_MODE,
             LOCK_SCREEN_OWNER_INFO,
-            LOCK_SCREEN_OWNER_INFO_ENABLED,
-            MESSAGING_APP_NOTIFICATIONS
+            LOCK_SCREEN_OWNER_INFO_ENABLED
         };
 
         /**

core/java/android/provider/Telephony.java

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 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";
-
     }
 }