summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2016-07-08 10:32:17 -0700
committerSteve Kondik <steve@cyngn.com>2016-08-25 21:55:20 -0700
commit94bd7a9f659d4b247275175a4c988d541dd51a8f (patch)
treedbf5b8ef90e17518ecb6760a797c4878732b3c57
parentc49498659b2bdfa654d0bb99979d95dfc139a7f6 (diff)
downloadandroid_packages_apps_Snap-94bd7a9f659d4b247275175a4c988d541dd51a8f.zip
android_packages_apps_Snap-94bd7a9f659d4b247275175a4c988d541dd51a8f.tar.gz
android_packages_apps_Snap-94bd7a9f659d4b247275175a4c988d541dd51a8f.tar.bz2
SnapdragonCamera: Fix json marking
Json marking was not proper. Fix it with proper marking Change-Id: Ic57757f165bd19fc34d33344c6b9b66b891f30a6
-rw-r--r--assets/dependency.json29
1 files changed, 28 insertions, 1 deletions
diff --git a/assets/dependency.json b/assets/dependency.json
index 6fe735b..bf567a0 100644
--- a/assets/dependency.json
+++ b/assets/dependency.json
@@ -1,7 +1,34 @@
{
"pref_camera2_scenemode_key":
{
- "_comment":"Copyright (c) 2016, The Linux Foundation. All rights reserved.\nNot a Contribution.\nCopyright (C) 2013 The Android Open Source Project\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\nhttp://www.apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and\nlimitations under the License.",
+ "_license":[
+ "Copyright (c) 2016, 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."
+ ],
"default":
{"pref_camera2_coloreffect_key":"0",
"pref_camera2_flashmode_key":"2",