From 2e466f96bc18eae60093d55ae8eb800d61a7ac4e Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Wed, 26 Feb 2020 12:55:45 -0800 Subject: Add kUpdateStatusCleanupPreviousUpdate. Test: pass Bug: 147696014 Change-Id: I63160745c5904597d4faf573a556ada753674b9f --- dbus/update_engine/dbus-constants.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dbus/update_engine/dbus-constants.h b/dbus/update_engine/dbus-constants.h index 9551b41..f496279 100644 --- a/dbus/update_engine/dbus-constants.h +++ b/dbus/update_engine/dbus-constants.h @@ -61,6 +61,8 @@ const char kUpdateStatusAttemptingRollback[] = const char kUpdateStatusDisabled[] = "UPDATE_STATUS_DISABLED"; const char kUpdateStatusNeedPermissionToUpdate[] = "UPDATE_STATUS_NEED_PERMISSION_TO_UPDATE"; +const char kUpdateStatusCleanupPreviousUpdate[] = + "UPDATE_STATUS_CLEANUP_PREVIOUS_UPDATE"; } // namespace update_engine #endif // SYSTEM_API_DBUS_UPDATE_ENGINE_DBUS_CONSTANTS_H_ -- cgit v1.2.3 From d827f1513b5b7282eb2fe0a0c5cd62bfe18659eb Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Wed, 25 Mar 2020 18:56:43 -0700 Subject: Remove redundant NOTICE copied from LICENSE. Identified using the below shell script: $ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \ | while read dir; do \ if [ -f "${dir}/NOTICE" ] \ && diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \ echo "${dir}/NOTICE"; \ fi; \ done Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are merged, LICENSE files copied into NOTICE files are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: Ic85f87c7bf3aa29d38d56ac600bb70d8dc4a8e48 --- NOTICE | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 NOTICE diff --git a/NOTICE b/NOTICE deleted file mode 100644 index d6ec73d..0000000 --- a/NOTICE +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2015 The Chromium OS Authors. 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 Google Inc. 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE 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. -- cgit v1.2.3 From 6f8051d341dbc00c3f5c242c19bb9d77067bcbdc Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Tue, 28 Apr 2020 09:21:41 -0700 Subject: Add METADATA to system_api: BSD=NOTICE Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I5f9876d6dd6a9c08d3361d6ab753f92be39adee2 --- METADATA | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 METADATA diff --git a/METADATA b/METADATA new file mode 100644 index 0000000..d97975c --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} -- cgit v1.2.3