summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzekaiz <zekaiz@codeaurora.org>2017-06-26 16:50:57 +0800
committerRashed Abdel-Tawab <rashed@linux.com>2017-12-05 16:59:03 -0800
commitfc0792e3c85d9b0b95e8e918c6b18574c29b98d6 (patch)
tree49dfc4f1211ea67df4dabdd522ff6b1b1c7b8b3f
parent88131faec60f08328a33131e6a8e1a63ba4d2eef (diff)
downloadandroid_packages_apps_DeskClock-fc0792e3c85d9b0b95e8e918c6b18574c29b98d6.tar.gz
android_packages_apps_DeskClock-fc0792e3c85d9b0b95e8e918c6b18574c29b98d6.tar.bz2
android_packages_apps_DeskClock-fc0792e3c85d9b0b95e8e918c6b18574c29b98d6.zip
DeskClock: FC due to proguard
Class PrefsFragment will be inflated via reflection but not be kept in proguard Add proguard file to keep this class Change-Id: I88fc061d1ce5d2aeefaa2adf34764a9e19868e64 CRs-Fixed: 2066006
-rw-r--r--Android.mk1
-rw-r--r--proguard-rules.pro33
2 files changed, 34 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index bee91034c..d5bfe766c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,6 +14,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src gen)
LOCAL_PROGUARD_FLAG_FILES := ../../../frameworks/support/design/proguard-rules.pro
LOCAL_PROGUARD_FLAG_FILES += ../../../frameworks/support/v7/preference/proguard-rules.pro
LOCAL_PROGUARD_FLAG_FILES += ../../../frameworks/support/v7/recyclerview/proguard-rules.pro
+LOCAL_PROGUARD_FLAG_FILES += proguard-rules.pro
LOCAL_STATIC_ANDROID_LIBRARIES := \
android-support-design \
diff --git a/proguard-rules.pro b/proguard-rules.pro
new file mode 100644
index 000000000..dc0fe5e6c
--- /dev/null
+++ b/proguard-rules.pro
@@ -0,0 +1,33 @@
+# Copyright (c) 2017, The Linux Foundation. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+# * Neither the name of The Linux Foundation nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Preference objects are inflated via reflection
+-keep public class android.support.v7.widget.SearchView {
+ public <init>(android.content.Context);
+}
+
+-keep public class com.android.deskclock.settings.ScreensaverSettingsActivity$PrefsFragment \ No newline at end of file