Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

Conflicts:
	cmds/bootanimation/BootAnimation.cpp
	core/java/android/accounts/AccountManager.java
	core/java/android/app/AppOpsManager.java
	core/java/android/os/PowerManagerInternal.java
	core/java/android/os/storage/IMountService.java
	core/java/android/provider/Settings.java
	core/java/com/android/internal/widget/ILockSettings.aidl
	core/res/res/values-mcc204-mnc12/config.xml
	core/res/res/values-mcc219-mnc02/config.xml
	core/res/res/values-mcc730-mnc07/config.xml
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	packages/SystemUI/res/values/config.xml
	packages/SystemUI/src/com/android/systemui/doze/DozeService.java
	packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
	packages/SystemUI/src/com/android/systemui/statusbar/ExpandableOutlineView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
	packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
	services/core/java/com/android/server/LocationManagerService.java
	services/core/java/com/android/server/am/ActivityManagerService.java
	services/core/java/com/android/server/pm/PackageManagerService.java
	services/core/java/com/android/server/power/PowerManagerService.java
	telecomm/java/android/telecom/Phone.java
	telephony/java/android/telephony/CarrierConfigManager.java
	telephony/java/android/telephony/RadioAccessFamily.java
	telephony/java/android/telephony/ServiceState.java
	telephony/java/android/telephony/SignalStrength.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/ims/ImsCallProfile.java
	telephony/java/com/android/ims/ImsReasonInfo.java
	telephony/java/com/android/ims/ImsSuppServiceNotification.aidl
	telephony/java/com/android/ims/ImsSuppServiceNotification.java
	telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl
	telephony/java/com/android/internal/telephony/RILConstants.java

Change-Id: I99c6edb8e25a77145b5adef97d0d55bfbe676959

1 files changed, 11 insertions, 24 deletions

diff --git a/telephony/java/com/android/ims/ImsSuppServiceNotification.aidl b/telephony/java/com/android/ims/ImsSuppServiceNotification.aidl
index ff21047..6b4479f 100644
--- a/telephony/java/com/android/ims/ImsSuppServiceNotification.aidl
+++ b/telephony/java/com/android/ims/ImsSuppServiceNotification.aidl
@@ -1,30 +1,17 @@
 /*
- * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015 The Android Open Source Project
  *
- * 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.
+ * 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
  *
- * 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.
+ *      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.
  */