From 8932020f542ae6dd4750fa823bbf2d2bcf504267 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@android.com>
Date: Thu, 24 Jun 2010 17:49:44 -0700
Subject: [PATCH] Fix the notification vibration setting and add a test app
 that lets you recover from the busted state.

Bug: 2767349
Change-Id: Id0c41734e82a1256a49175a2dc6b40f0abaf4f8b
---
 .../providers/settings/DatabaseHelper.java    |   2 +-
 tests/FixVibrateSetting/Android.mk            |  11 ++
 tests/FixVibrateSetting/AndroidManifest.xml   |  14 ++
 .../res/drawable-hdpi/stat_sys_warning.png    | Bin 0 -> 1057 bytes
 .../res/drawable-mdpi/stat_sys_warning.png    | Bin 0 -> 651 bytes
 .../res/layout/fix_vibrate.xml                |  46 +++++++
 .../FixVibrateSetting/res/values/strings.xml  |  25 ++++
 .../fixvibratesetting/FixVibrateSetting.java  | 123 ++++++++++++++++++
 8 files changed, 220 insertions(+), 1 deletion(-)
 create mode 100644 tests/FixVibrateSetting/Android.mk
 create mode 100644 tests/FixVibrateSetting/AndroidManifest.xml
 create mode 100644 tests/FixVibrateSetting/res/drawable-hdpi/stat_sys_warning.png
 create mode 100644 tests/FixVibrateSetting/res/drawable-mdpi/stat_sys_warning.png
 create mode 100644 tests/FixVibrateSetting/res/layout/fix_vibrate.xml
 create mode 100644 tests/FixVibrateSetting/res/values/strings.xml
 create mode 100644 tests/FixVibrateSetting/src/com/android/fixvibratesetting/FixVibrateSetting.java

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 2b4714def1f8c..cd4f96d5dd054 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -952,7 +952,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
             int vibrate = 0;
             vibrate = AudioService.getValueForVibrateSetting(vibrate,
                     AudioManager.VIBRATE_TYPE_NOTIFICATION, AudioManager.VIBRATE_SETTING_ON);
-            vibrate = AudioService.getValueForVibrateSetting(vibrate,
+            vibrate |= AudioService.getValueForVibrateSetting(vibrate,
                     AudioManager.VIBRATE_TYPE_RINGER, AudioManager.VIBRATE_SETTING_OFF);
             loadSetting(stmt, Settings.System.VIBRATE_ON, vibrate);
         } finally {
diff --git a/tests/FixVibrateSetting/Android.mk b/tests/FixVibrateSetting/Android.mk
new file mode 100644
index 0000000000000..2a88e5a4f5843
--- /dev/null
+++ b/tests/FixVibrateSetting/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PACKAGE_NAME := FixVibrateSetting
+LOCAL_CERTIFICATE := platform
+
+include $(BUILD_PACKAGE)
diff --git a/tests/FixVibrateSetting/AndroidManifest.xml b/tests/FixVibrateSetting/AndroidManifest.xml
new file mode 100644
index 0000000000000..007d6821498b5
--- /dev/null
+++ b/tests/FixVibrateSetting/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.android.fixvibratesetting">
+    <uses-permission android:name="android.permission.VIBRATE" />
+
+    <application>
+        <activity android:name="FixVibrateSetting" android:label="@string/app_label">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/tests/FixVibrateSetting/res/drawable-hdpi/stat_sys_warning.png b/tests/FixVibrateSetting/res/drawable-hdpi/stat_sys_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..37c8853a4694c672577c5ead5aa08005ead1a066
GIT binary patch
literal 1057
zcmV++1m63JP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#!%0LzRCwC#SWQS9K^UF<7>!1v5i~Ie
zQ36Uq4E9h#gTW#MJP8(2k3xhT1)(5_0Yylm2mw84FNJ#Pt<Y;vg<jg5C#m#W6=ULG
zM2+^nAzK#RY&Pac4-R}}c6Mg=eeZqWx3e+b-rkC**v#UIwr604HfymPgu`KRcz7rh
ziG(njOroi&Nw{1tVX;^YtzTPPD-W<_GARxY4qm`E2`rPzOqtE*KLq%wjGdgESgNY3
zKDD>E`<daFmzN(?sZ^k*rbgK9_Q#7cFcby|e@jb?pjB5_4{(gqUR_=BzOI!8*zoYM
z7c4E+)zt~eC*#WDaPZd3#l?jSY>Jzk8(k|4Fl-!yj4n#1Fu*>?(2p_x0I;%*4Wa?q
zB-!EvuCK49v0qzT%PG@{w*i7v?rB*`fdP{Z5^j<mtJQjs1u(`~Bct)t(^CtqGK|5~
zS(FAJfzj(=Feo-QHlz&=4aqUy!yG>nV2-STz49{F*VpHRrwe3+9y9YMCMIOi)5gcg
z<ro7y%i28R%!?8t$M0InfC0=Z<g-&Q#cOqyXI~lT9L#l~A7_T9)9Las*4x`Vir5-q
z@l*%AhSdKPfvlm8f}N4$<73H^5nzTZe@{;j3sjsBVuja};qE;q2-sRZKR^G5dY7hS
zC9C}KZXUtxRZEzUF}0*<GB%l^>O?4tv97KzKS0gVbFIzPr{G*{5*z@{V*Lli+wW|x
zD-Iazk<Dha@U^4orJAvO(qJvj25_5@G{|c@`e0xk9UaryWPsVG7gu^Qrp{O}ItWQ8
zA?cPLYr4SN+S*+BiK(l5F~Ah&a6g8<zTz_VAYfR$0xw-W0P0D|U{<Zsoy)z@yxbdw
zH&Sp`y4`Mhu2Mj0Rc*x<7Z>G8mPK@Vd0BTZ_sX7h!*Ix-(*dpT%I4-~mhzvF(4S59
zk~gvpaKF%fwZFfgF(f4x@Fnffm0_i5WDVK=62ydYxt>?bhK2^}zd$DQNvK#T6cXFp
z+tLDofT1<qo6o?rmYhzfJFk@W_4S|O&6r+|x!ZPkcSU1kqwGT#7UV*XPz1Pz_?*fq
zB~GIw_!(opF<Kh59#rVs>`8e2?Ck8jCNNBRo6VSlHlCT85%G9j_9Kx<!Eu@WD2c*e
zYf6c?eiFc(mHr0^uRCVxU(_{^CS%>*-9Hd3p`D!_vA4JPU^xwcZ6l6bTU&+C=My;L
ze#seQ9*^fuXJ==$zrTN)%vFLdsFOH4I(iQ>-sLT@g|uiiS_~-p)-YW8pZ_0w23ErM
bPk;dc{t`wy=RFT000000NkvXXu0mjf_A&ED

literal 0
HcmV?d00001

diff --git a/tests/FixVibrateSetting/res/drawable-mdpi/stat_sys_warning.png b/tests/FixVibrateSetting/res/drawable-mdpi/stat_sys_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..be00f470ad6a596d0054a6f95b112b835d1c21e0
GIT binary patch
literal 651
zcmV;60(AX}P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!ElET{RCwCVR=bKKQ4p>6{Q_GQ6r)xU
z1VLsZACY5Xs^ACACkTGPbZpXJAd{II8g6Q~n;Yx~1_q)cg81yMbJ-S^R;HbvWeSS2
z@2$r@r*3sC>AFr|Ee`q*^8Jbwi^Wzpo7GFDQp-x5^wFNwYBfcYq@QlLTi);Y3tmbM
z27`sINRG#&=J9ysXf#Srr&Hc;x0<bVRjbtsBd!Mm0Rr-1Fi4E*73;PYVS3)ZUN1Qu
z4%+Q@Ktg!tb<LI{<#Ji&Q!757kDARU^?E&FQH0l@u>YyX7YYT1&F^qHOn$$g`u)B@
z!~LN~qe1KSnwHBYn*Tf;4*xua1T=vfC^uRZ5J7B>XGSA4h1x@O<@5Ra;c%$9TrS#d
zHbTz@&nSd_K1`kcE0&7nayiU`1_Yo6$)M+AtbuO$F`9QvML4*{!HPl4y&_N)fqy2G
zQ9o29l}bG^iZ|w3BrvElqsvgEKZxUa<vOR!q}dvH1`XGz$Bgi6McC`T^UK2K<tCDN
zJpRf~nC^>{8rto4g&(ZhKH?CcNF?f}a}tZiWXuGkkb&e;;UZAX%=2_QU0fhx3f}n2
z%ICM~THEb5jmKkQZ~1TzsDgYKNJ60y?)VSf5@X=ZWImsten%padv9z}3}{xX)i05e
z7c^r7O}(X^PDdnxz2}EK|MF=kB*|n_$9G~h8rk;AO{dc|o6Tr4nMkL`tE#HsqspoP
l3Fnk7eSW|Fzm>lN3;+?=xV(guKZO7Q002ovPDHLkV1kv~Eqnj~

literal 0
HcmV?d00001

diff --git a/tests/FixVibrateSetting/res/layout/fix_vibrate.xml b/tests/FixVibrateSetting/res/layout/fix_vibrate.xml
new file mode 100644
index 0000000000000..c505e653e5508
--- /dev/null
+++ b/tests/FixVibrateSetting/res/layout/fix_vibrate.xml
@@ -0,0 +1,46 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    >
+
+    <TextView android:id="@+id/current_setting"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left"
+        android:layout_marginTop="30dp"
+        android:layout_marginBottom="50dp"
+        android:paddingLeft="8dp"
+        android:paddingTop="4dp"
+        android:textSize="20sp"
+        android:textColor="#ffffffff"
+        />
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal"
+        >
+        <Button android:id="@+id/fix"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/fix"
+            />
+
+        <Button android:id="@+id/unfix"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/unfix"
+            />
+    </LinearLayout>
+
+    <Button android:id="@+id/test"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/test"
+        />
+
+</LinearLayout>
+
diff --git a/tests/FixVibrateSetting/res/values/strings.xml b/tests/FixVibrateSetting/res/values/strings.xml
new file mode 100644
index 0000000000000..269cef3a715ba
--- /dev/null
+++ b/tests/FixVibrateSetting/res/values/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 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.
+-->
+
+<resources>
+    <string name="app_label">Fix Vibrate</string>
+    <string name="title">Fix vibrate setting</string>
+    <string name="current_setting">"Ringer: %1$s\nNotification: %2$s"</string>
+    <string name="fix">Fix the setting</string>
+    <string name="unfix">Break the setting</string>
+    <string name="test">Test the setting</string>
+</resources>
+
diff --git a/tests/FixVibrateSetting/src/com/android/fixvibratesetting/FixVibrateSetting.java b/tests/FixVibrateSetting/src/com/android/fixvibratesetting/FixVibrateSetting.java
new file mode 100644
index 0000000000000..947ea78af27cb
--- /dev/null
+++ b/tests/FixVibrateSetting/src/com/android/fixvibratesetting/FixVibrateSetting.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2008 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.fixvibratesetting;
+
+import android.app.Activity;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.media.AudioManager;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
+import android.os.Bundle;
+
+public class FixVibrateSetting extends Activity implements View.OnClickListener
+{
+    AudioManager mAudioManager;
+    NotificationManager mNotificationManager;
+    TextView mCurrentSetting;
+    View mFix;
+    View mUnfix;
+    View mTest;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        setContentView(R.layout.fix_vibrate);
+
+        mAudioManager = (AudioManager)getSystemService(AUDIO_SERVICE);
+        mNotificationManager = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
+
+        mCurrentSetting = (TextView)findViewById(R.id.current_setting);
+
+        mFix = findViewById(R.id.fix);
+        mFix.setOnClickListener(this);
+
+        mUnfix = findViewById(R.id.unfix);
+        mUnfix.setOnClickListener(this);
+
+        mTest = findViewById(R.id.test);
+        mTest.setOnClickListener(this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        update();
+    }
+
+    private String getSettingValue(int vibrateType) {
+        int setting = mAudioManager.getVibrateSetting(vibrateType);
+        switch (setting) {
+            case AudioManager.VIBRATE_SETTING_OFF:
+                return "off";
+            case AudioManager.VIBRATE_SETTING_ON:
+                return "on";
+            case AudioManager.VIBRATE_SETTING_ONLY_SILENT:
+                return "silent-only";
+            default:
+                return "unknown";
+        }
+    }
+
+    public void onClick(View v) {
+        if (v == mFix) {
+            fix();
+            update();
+        } else if (v == mUnfix) {
+            unfix();
+            update();
+        } else if (v == mTest) {
+            test();
+            update();
+        }
+    }
+
+    private void update() {
+        String ringer = getSettingValue(AudioManager.VIBRATE_TYPE_RINGER);
+        String notification = getSettingValue(AudioManager.VIBRATE_TYPE_NOTIFICATION);
+        String text = getString(R.string.current_setting, ringer, notification);
+        mCurrentSetting.setText(text);
+    }
+
+    private void fix() {
+        mAudioManager.setVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION,
+                AudioManager.VIBRATE_SETTING_ON);
+    }
+
+    private void unfix() {
+        mAudioManager.setVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION,
+                AudioManager.VIBRATE_SETTING_OFF);
+    }
+
+    private void test() {
+        Notification n = new Notification(R.drawable.stat_sys_warning, "Test notification",
+                        System.currentTimeMillis());
+        Intent intent = new Intent(this, FixVibrateSetting.class);
+        PendingIntent pending = PendingIntent.getActivity(this, 0, intent, 0);
+        n.setLatestEventInfo(this, "Test notification", "Test notification", pending);
+
+        n.vibrate = new long[] { 0, 700, 500, 1000 };
+        n.flags |= Notification.FLAG_AUTO_CANCEL;
+        mNotificationManager.notify(1, n);
+    }
+}
+