diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-12 15:06:13 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 15:06:13 -0700 |
commit | 1f35de2a2e9a5607cc3bc57fbd33c65392c82cfd (patch) | |
tree | ca1b5e4ef280c0049075236ed46b91a3db7c24ce /telephony | |
parent | d6e24ca28b0b6384fd9b3117713402a1f43fdef8 (diff) | |
parent | 79090cb3da132d07cd3888ef9242df9872fb4aa1 (diff) | |
download | frameworks_base-1f35de2a2e9a5607cc3bc57fbd33c65392c82cfd.zip frameworks_base-1f35de2a2e9a5607cc3bc57fbd33c65392c82cfd.tar.gz frameworks_base-1f35de2a2e9a5607cc3bc57fbd33c65392c82cfd.tar.bz2 |
am 79090cb3: merge from open-source master
Merge commit '79090cb3da132d07cd3888ef9242df9872fb4aa1' into kraken
* commit '79090cb3da132d07cd3888ef9242df9872fb4aa1':
Change license for the UUS Information file.
Remove ProximityAlerts Receiver when last ProximityAlert expires.
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/com/android/internal/telephony/UUSInfo.java | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/telephony/java/com/android/internal/telephony/UUSInfo.java b/telephony/java/com/android/internal/telephony/UUSInfo.java index 30f7c82..801b845 100644 --- a/telephony/java/com/android/internal/telephony/UUSInfo.java +++ b/telephony/java/com/android/internal/telephony/UUSInfo.java @@ -1,29 +1,17 @@ -/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +/* + * Copyright (C) 2010 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 Code Aurora 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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. */ package com.android.internal.telephony; |