From 938468da6f5c225ebb161a68bd949c9cf3261892 Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Tue, 24 Oct 2017 14:05:52 -0700 Subject: Rename the new bubble package name from "bubble" to "newbubble". It fixes AOSP for package name conflict. Test: manual PiperOrigin-RevId: 173298696 Change-Id: Id10ebe0bcf029e61f65cf6580c7198abd8395081 --- .../buildtype/bugfood/BuildTypeAccessorImpl.java | 30 ---------------------- .../buildtype/dogfood/BuildTypeAccessorImpl.java | 30 ---------------------- .../buildtype/fishfood/BuildTypeAccessorImpl.java | 30 ---------------------- .../buildtype/test/BuildTypeAccessorImpl.java | 30 ---------------------- 4 files changed, 120 deletions(-) delete mode 100644 java/com/android/dialer/buildtype/bugfood/BuildTypeAccessorImpl.java delete mode 100644 java/com/android/dialer/buildtype/dogfood/BuildTypeAccessorImpl.java delete mode 100644 java/com/android/dialer/buildtype/fishfood/BuildTypeAccessorImpl.java delete mode 100644 java/com/android/dialer/buildtype/test/BuildTypeAccessorImpl.java (limited to 'java/com/android/dialer/buildtype') diff --git a/java/com/android/dialer/buildtype/bugfood/BuildTypeAccessorImpl.java b/java/com/android/dialer/buildtype/bugfood/BuildTypeAccessorImpl.java deleted file mode 100644 index 45d72e05c..000000000 --- a/java/com/android/dialer/buildtype/bugfood/BuildTypeAccessorImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2017 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 com.android.dialer.buildtype; - -import com.android.dialer.proguard.UsedByReflection; - -/** Gets the build type. */ -@UsedByReflection(value = "BuildType.java") -public class BuildTypeAccessorImpl implements BuildTypeAccessor { - - @Override - @BuildType.Type - public int getBuildType() { - return BuildType.BUGFOOD; - } -} diff --git a/java/com/android/dialer/buildtype/dogfood/BuildTypeAccessorImpl.java b/java/com/android/dialer/buildtype/dogfood/BuildTypeAccessorImpl.java deleted file mode 100644 index e1f2cdc79..000000000 --- a/java/com/android/dialer/buildtype/dogfood/BuildTypeAccessorImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2017 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 com.android.dialer.buildtype; - -import com.android.dialer.proguard.UsedByReflection; - -/** Gets the build type. */ -@UsedByReflection(value = "BuildType.java") -public class BuildTypeAccessorImpl implements BuildTypeAccessor { - - @Override - @BuildType.Type - public int getBuildType() { - return BuildType.DOGFOOD; - } -} diff --git a/java/com/android/dialer/buildtype/fishfood/BuildTypeAccessorImpl.java b/java/com/android/dialer/buildtype/fishfood/BuildTypeAccessorImpl.java deleted file mode 100644 index e5ad9015f..000000000 --- a/java/com/android/dialer/buildtype/fishfood/BuildTypeAccessorImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2017 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 com.android.dialer.buildtype; - -import com.android.dialer.proguard.UsedByReflection; - -/** Gets the build type. */ -@UsedByReflection(value = "BuildType.java") -public class BuildTypeAccessorImpl implements BuildTypeAccessor { - - @Override - @BuildType.Type - public int getBuildType() { - return BuildType.FISHFOOD; - } -} diff --git a/java/com/android/dialer/buildtype/test/BuildTypeAccessorImpl.java b/java/com/android/dialer/buildtype/test/BuildTypeAccessorImpl.java deleted file mode 100644 index 80a1cb728..000000000 --- a/java/com/android/dialer/buildtype/test/BuildTypeAccessorImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2017 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 com.android.dialer.buildtype; - -import com.android.dialer.proguard.UsedByReflection; - -/** Gets the build type. */ -@UsedByReflection(value = "BuildType.java") -public class BuildTypeAccessorImpl implements BuildTypeAccessor { - - @Override - @BuildType.Type - public int getBuildType() { - return BuildType.TEST; - } -} -- cgit v1.2.3