Merge "Use updatable file for premium-sms filter" into jb-mr1-dev

Author: Robert Greenwalt

core/java/android/provider/Settings.java

@@ -4624,13 +4624,6 @@ public static final class Global extends NameValueTable {
          */
         public static final String SMS_SHORT_CODE_RULE = "sms_short_code_rule";
 
-       /**
-        * Prefix for SMS short code regex patterns (country code is appended).
-        * @see com.android.internal.telephony.SmsUsageMonitor
-        * @hide
-        */
-       public static final String SMS_SHORT_CODES_PREFIX = "sms_short_codes_";
-
        /**
         * Used to disable Tethering on a device - defaults to true
         * @hide

core/res/AndroidManifest.xml

@@ -2152,6 +2152,12 @@
             </intent-filter>
         </receiver>
 
+        <receiver android:name="com.android.server.updates.SmsShortCodesInstallReceiver" >
+            <intent-filter>
+                <action android:name="android.intent.action.UPDATE_SMS_SHORT_CODES" />
+            </intent-filter>
+        </receiver>
+
         <receiver android:name="com.android.server.MasterClearReceiver"
             android:permission="android.permission.MASTER_CLEAR"
             android:priority="100" >

core/res/res/values/symbols.xml

@@ -1092,7 +1092,6 @@
   <java-symbol type="xml" name="kg_password_kbd_numeric" />
   <java-symbol type="xml" name="power_profile" />
   <java-symbol type="xml" name="time_zones_by_country" />
-  <java-symbol type="xml" name="sms_short_codes" />
 
   <java-symbol type="raw" name="accessibility_gestures" />
   <java-symbol type="raw" name="incognito_mode_start_page" />

core/res/res/xml/sms_short_codes.xml

@@ -126,7 +126,7 @@ private X509Certificate getCert(ContentResolver cr) {
             CertificateFactory cf = CertificateFactory.getInstance("X.509");
             return (X509Certificate) cf.generateCertificate(istream);
         } catch (CertificateException e) {
-            throw new IllegalStateException("Got malformed certificate from settings, ignoring", e);
+            throw new IllegalStateException("Got malformed certificate from settings, ignoring");
         }
     }
 
@@ -167,7 +167,7 @@ private int getCurrentVersion() throws NumberFormatException {
             String strVersion = IoUtils.readFileAsString(updateVersion.getCanonicalPath()).trim();
             return Integer.parseInt(strVersion);
         } catch (IOException e) {
-            Slog.i(TAG, "Couldn't find current metadata, assuming first update", e);
+            Slog.i(TAG, "Couldn't find current metadata, assuming first update");
             return 0;
         }
     }
@@ -181,7 +181,7 @@ private String getCurrentContent() {
         try {
             return IoUtils.readFileAsString(updateContent.getCanonicalPath()).trim();
         } catch (IOException e) {
-            Slog.i(TAG, "Failed to read current content, assuming first update!", e);
+            Slog.i(TAG, "Failed to read current content, assuming first update!");
             return null;
         }
     }

services/java/com/android/server/updates/ConfigUpdateInstallReceiver.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.updates;
+
+public class SmsShortCodesInstallReceiver extends ConfigUpdateInstallReceiver {
+
+    public SmsShortCodesInstallReceiver() {
+        super("/data/misc/sms/", "codes", "metadata/", "version");
+    }
+}