summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-03-17 11:48:13 -0700
committerJames Dong <jdong@google.com>2011-03-17 14:43:12 -0700
commit8eb69d60c09c1c4683066a94c889df28d0e9d233 (patch)
tree06d7e2a8ab38ab235cba0bab8e020ef5aeba7b60 /services
parent27c174483a8ae9688d5d4897c19074f62c7f1701 (diff)
downloadframeworks_av-8eb69d60c09c1c4683066a94c889df28d0e9d233.zip
frameworks_av-8eb69d60c09c1c4683066a94c889df28d0e9d233.tar.gz
frameworks_av-8eb69d60c09c1c4683066a94c889df28d0e9d233.tar.bz2
Fix missing AOSP copyright headers for more files
o Update the copyright date on InputDispatcher_test.cpp and InputReader_test.cpp because these two files were moved from other places to the current location, and were actually created in 2010. bug - 4119349 Change-Id: Ic93b81ddafb58e9e72a2e9e02ca3d9f173d6dca7
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/CannedJpeg.h16
-rw-r--r--services/camera/tests/CameraServiceTest/CameraServiceTest.cpp16
2 files changed, 32 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/CannedJpeg.h b/services/camera/libcameraservice/CannedJpeg.h
index b6266fb..6dd99c1 100644
--- a/services/camera/libcameraservice/CannedJpeg.h
+++ b/services/camera/libcameraservice/CannedJpeg.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 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.
+ */
+
const int kCannedJpegWidth = 320;
const int kCannedJpegHeight = 240;
const int kCannedJpegSize = 8733;
diff --git a/services/camera/tests/CameraServiceTest/CameraServiceTest.cpp b/services/camera/tests/CameraServiceTest/CameraServiceTest.cpp
index 3c8d553..8a228fd 100644
--- a/services/camera/tests/CameraServiceTest/CameraServiceTest.cpp
+++ b/services/camera/tests/CameraServiceTest/CameraServiceTest.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 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.
+ */
+
#define LOG_TAG "CameraServiceTest"
#include <stdio.h>