diff options
author | Christopher Tate <ctate@google.com> | 2014-06-02 19:10:54 -0700 |
---|---|---|
committer | Christopher Tate <ctate@google.com> | 2014-06-02 19:10:54 -0700 |
commit | c777185688d1de4f1c989b3f7630e7715fd71be3 (patch) | |
tree | cfec3ce1570a1f0bccb69ad37c32d02c9f19b0d9 /core | |
parent | bfb131317b51931569b4d375f1dc652a17d0b954 (diff) | |
download | frameworks_base-c777185688d1de4f1c989b3f7630e7715fd71be3.zip frameworks_base-c777185688d1de4f1c989b3f7630e7715fd71be3.tar.gz frameworks_base-c777185688d1de4f1c989b3f7630e7715fd71be3.tar.bz2 |
Finish migration of backup transport constants
...and make sure to fix a couple of lingering Javadoc references.
Bug 15329632
Change-Id: I1de7b53a58940834cd2dae2301fd5f65dbb48ba6
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/app/backup/BackupTransport.java | 4 | ||||
-rw-r--r-- | core/java/com/android/internal/backup/BackupConstants.java | 28 |
2 files changed, 2 insertions, 30 deletions
diff --git a/core/java/android/app/backup/BackupTransport.java b/core/java/android/app/backup/BackupTransport.java index 93acbbb..46f082e 100644 --- a/core/java/android/app/backup/BackupTransport.java +++ b/core/java/android/app/backup/BackupTransport.java @@ -113,8 +113,8 @@ public class BackupTransport { * this is called, {@link #finishBackup} will be called to ensure the request * is sent and received successfully. * - * @return One of {@link BackupConstants#TRANSPORT_OK} (OK so far) or - * {@link BackupConstants#TRANSPORT_ERROR} (on network error or other failure). + * @return One of {@link BackupTransport#TRANSPORT_OK} (OK so far) or + * {@link BackupTransport#TRANSPORT_ERROR} (on network error or other failure). */ public int initializeDevice() { return BackupTransport.TRANSPORT_ERROR; diff --git a/core/java/com/android/internal/backup/BackupConstants.java b/core/java/com/android/internal/backup/BackupConstants.java deleted file mode 100644 index 4c276b7..0000000 --- a/core/java/com/android/internal/backup/BackupConstants.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2009 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.internal.backup; - -/** - * Constants used internally between the backup manager and its transports - */ -public class BackupConstants { - public static final int TRANSPORT_OK = 0; - public static final int TRANSPORT_ERROR = 1; - public static final int TRANSPORT_NOT_INITIALIZED = 2; - public static final int AGENT_ERROR = 3; - public static final int AGENT_UNKNOWN = 4; -} |