Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6269baa authored by Baligh Uddin's avatar Baligh Uddin Committed by Android (Google) Code Review
Browse files

Merge "Remove annotations that have been relocated" into rvc-qpr-dev-plus-aosp

parents 77b8f585 800380eb

Android.bp

+1 −40
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ filegroup { 
    name: "framework-non-updatable-sources",

    srcs: [

        // Java/AIDL sources under frameworks/base

        ":framework-annotations",

        ":framework-blobstore-sources",

        ":framework-core-sources",

        ":framework-drm-sources",
@@ -340,46 +341,6 @@ platform_compat_config { 
    src: ":framework-minus-apex",

}



filegroup {

    name: "framework-annotations",

    srcs: [

        "core/java/android/annotation/AnyThread.java",

        "core/java/android/annotation/AppIdInt.java",

        "core/java/android/annotation/BytesLong.java",

        "core/java/android/annotation/CallbackExecutor.java",

        "core/java/android/annotation/CallSuper.java",

        "core/java/android/annotation/CheckResult.java",

        "core/java/android/annotation/CurrentTimeMillisLong.java",

        "core/java/android/annotation/CurrentTimeSecondsLong.java",

        "core/java/android/annotation/DrawableRes.java",

        "core/java/android/annotation/DurationMillisLong.java",

        "core/java/android/annotation/Hide.java",

        "core/java/android/annotation/IntDef.java",

        "core/java/android/annotation/IntRange.java",

        "core/java/android/annotation/LongDef.java",

        "core/java/android/annotation/MainThread.java",

        "core/java/android/annotation/NonNull.java",

        "core/java/android/annotation/Nullable.java",

        "core/java/android/annotation/RequiresPermission.java",

        "core/java/android/annotation/SdkConstant.java",

        "core/java/android/annotation/StringDef.java",

        "core/java/android/annotation/SystemApi.java",

        "core/java/android/annotation/SystemService.java",

        "core/java/android/annotation/TestApi.java",

        "core/java/android/annotation/UserIdInt.java",

        "core/java/android/annotation/WorkerThread.java",

        "core/java/com/android/internal/annotations/GuardedBy.java",

        "core/java/com/android/internal/annotations/Immutable.java",

        "core/java/com/android/internal/annotations/VisibleForTesting.java",

    ],

}



java_library {

    name: "framework-annotations-lib",

    srcs: [":framework-annotations"],

    sdk_version: "core_current",

}



filegroup {

    name: "framework-ike-shared-srcs",

    visibility: ["//packages/modules/IPsec"],

core/java/Android.bp

+0 −38
Original line number Diff line number Diff line
@@ -46,43 +46,6 @@ filegroup { 
        "android/accounts/AccountsException.java",

        "android/accounts/AuthenticatorException.java",

        "android/accounts/OperationCanceledException.java",

        "android/annotation/AnimatorRes.java",

        "android/annotation/AnimRes.java",

        "android/annotation/AnyRes.java",

        "android/annotation/ArrayRes.java",

        "android/annotation/AttrRes.java",

        "android/annotation/BoolRes.java",

        "android/annotation/BroadcastBehavior.java",

        "android/annotation/CallbackExecutor.java",

        "android/annotation/CallSuper.java",

        "android/annotation/CheckResult.java",

        "android/annotation/ColorInt.java",

        "android/annotation/ColorRes.java",

        "android/annotation/DimenRes.java",

        "android/annotation/DrawableRes.java",

        "android/annotation/FontRes.java",

        "android/annotation/FractionRes.java",

        "android/annotation/IntDef.java",

        "android/annotation/IntegerRes.java",

        "android/annotation/IntRange.java",

        "android/annotation/LayoutRes.java",

        "android/annotation/NonNull.java",

        "android/annotation/Nullable.java",

        "android/annotation/PluralsRes.java",

        "android/annotation/RawRes.java",

        "android/annotation/RequiresPermission.java",

        "android/annotation/SdkConstant.java",

        "android/annotation/Size.java",

        "android/annotation/StringDef.java",

        "android/annotation/StringRes.java",

        "android/annotation/StyleableRes.java",

        "android/annotation/StyleRes.java",

        "android/annotation/SuppressLint.java",

        "android/annotation/SystemApi.java",

        "android/annotation/SystemService.java",

        "android/annotation/TestApi.java",

        "android/annotation/UserIdInt.java",

        "android/annotation/XmlRes.java",

        "android/app/Application.java",

        "android/app/IApplicationThread.aidl",

        "android/app/IServiceConnection.aidl",
@@ -123,7 +86,6 @@ filegroup { 
        "android/util/AndroidException.java",

        "android/view/DisplayAdjustments.java",

        "android/view/ViewDebug.java",

        "com/android/internal/annotations/VisibleForTesting.java",

    ],

    visibility: ["//frameworks/base/test-mock"],

}

core/java/android/annotation/AnimRes.java

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 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.

 */

package android.annotation;



import java.lang.annotation.Documented;

import java.lang.annotation.Retention;

import java.lang.annotation.Target;



import static java.lang.annotation.ElementType.FIELD;

import static java.lang.annotation.ElementType.METHOD;

import static java.lang.annotation.ElementType.PARAMETER;

import static java.lang.annotation.RetentionPolicy.SOURCE;



/**

 * Denotes that an integer parameter, field or method return value is expected

 * to be an anim resource reference (e.g. {@link android.R.anim#fade_in}).

 *

 * {@hide}

 */

@Documented

@Retention(SOURCE)

@Target({METHOD, PARAMETER, FIELD})

public @interface AnimRes {

}

core/java/android/annotation/AnimatorRes.java

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 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.

 */

package android.annotation;



import java.lang.annotation.Documented;

import java.lang.annotation.Retention;

import java.lang.annotation.Target;



import static java.lang.annotation.ElementType.FIELD;

import static java.lang.annotation.ElementType.METHOD;

import static java.lang.annotation.ElementType.PARAMETER;

import static java.lang.annotation.RetentionPolicy.SOURCE;



/**

 * Denotes that an integer parameter, field or method return value is expected

 * to be an animator resource reference (e.g. {@link android.R.animator#fade_in}).

 *

 * {@hide}

 */

@Documented

@Retention(SOURCE)

@Target({METHOD, PARAMETER, FIELD})

public @interface AnimatorRes {

}

core/java/android/annotation/AnyRes.java

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 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.

 */

package android.annotation;



import java.lang.annotation.Documented;

import java.lang.annotation.Retention;

import java.lang.annotation.Target;



import static java.lang.annotation.ElementType.FIELD;

import static java.lang.annotation.ElementType.METHOD;

import static java.lang.annotation.ElementType.PARAMETER;

import static java.lang.annotation.RetentionPolicy.SOURCE;



/**

 * Denotes that an integer parameter, field or method return value is expected

 * to be a resource reference of any type. If the specific type is known, use

 * one of the more specific annotations instead, such as {@link StringRes} or

 * {@link DrawableRes}.

 *

 * {@hide}

 */

@Documented

@Retention(SOURCE)

@Target({METHOD, PARAMETER, FIELD})

public @interface AnyRes {

}