From 6d299d2f453200e3f2699e9777a6ecfcb5b8d471 Mon Sep 17 00:00:00 2001 From: Al Sutton Date: Wed, 16 Oct 2019 11:18:27 +0100 Subject: [PATCH] Soft removal LocalTansport#dataManagementLabel This API was deprecated in Q and so moves to soft-removal in R. Bug: 134661849 Test: m clobber; m -j and ensure compile completes without errors Test: atest CtsBackupTestCases Change-Id: I749bb26155ad63245065d32d82ffe995a7d30fa5 --- .../src/com/android/localtransport/LocalTransport.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/LocalTransport/src/com/android/localtransport/LocalTransport.java b/packages/LocalTransport/src/com/android/localtransport/LocalTransport.java index 4408ef5a2c755..be3bcc774cd13 100644 --- a/packages/LocalTransport/src/com/android/localtransport/LocalTransport.java +++ b/packages/LocalTransport/src/com/android/localtransport/LocalTransport.java @@ -16,6 +16,7 @@ package com.android.localtransport; +import android.annotation.Nullable; import android.app.backup.BackupAgent; import android.app.backup.BackupDataInput; import android.app.backup.BackupDataOutput; @@ -142,10 +143,17 @@ public class LocalTransport extends BackupTransport { return null; } + /** @removed Replaced with dataManagementIntentLabel in the API */ public String dataManagementLabel() { return TRANSPORT_DATA_MANAGEMENT_LABEL; } + @Override + @Nullable + public CharSequence dataManagementIntentLabel() { + return TRANSPORT_DATA_MANAGEMENT_LABEL; + } + @Override public String transportDirName() { return TRANSPORT_DIR_NAME;