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

Commit 3e1381b8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Frameworks : Fix the string can't be translated in Settings."

parents be707786 fcb4ceaa

core/java/com/android/internal/backup/LocalTransport.java

+2 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.RemoteException; 
import android.os.SELinux;

import android.util.Log;



import com.android.internal.R;

import com.android.org.bouncycastle.util.encoders.Base64;



import java.io.File;
@@ -52,8 +53,6 @@ public class LocalTransport extends IBackupTransport.Stub { 
    private static final String TRANSPORT_DIR_NAME

            = "com.android.internal.backup.LocalTransport";



    private static final String TRANSPORT_DESTINATION_STRING

            = "Backing up to debug-only private cache";



    // The single hardcoded restore set always has the same (nonzero!) token

    private static final long RESTORE_TOKEN = 1;
@@ -82,7 +81,7 @@ public class LocalTransport extends IBackupTransport.Stub { 
    }



    public String currentDestinationString() {

        return TRANSPORT_DESTINATION_STRING;

        return mContext.getString(R.string.transport_destination_string);

    }



    public String transportDirName() {

core/res/res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -4548,4 +4548,5 @@ 
    <string name="stk_cc_ss_to_ss">SS request is modified to new SS request.</string>



    <string name="permission">Permission</string>

    <string name="transport_destination_string">Backing up to debug-only private cache</string>

</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1727,6 +1727,7 @@ 
  <java-symbol type="id" name="body" />

  <java-symbol type="string" name="fast_scroll_alphabet" />

  <java-symbol type="string" name="ssl_certificate" />

  <java-symbol type="string" name="transport_destination_string" />



  <!-- From Phone -->

  <java-symbol type="bool" name="config_built_in_sip_phone" />