Merge "Fixed spans getting stripped from disclaimer"

2016-10-07 20:55:27 +00:00
parent ce6affc371 896c870b09
commit e87af45f41
2 changed files with 4 additions and 4 deletions
--- a/src/com/android/settings/overlay/SupportFeatureProvider.java
+++ b/src/com/android/settings/overlay/SupportFeatureProvider.java
@@ -18,6 +18,7 @@ package com.android.settings.overlay;

 import android.accounts.Account;
 import android.annotation.IntDef;
+import android.annotation.StringRes;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -141,5 +142,6 @@ public interface SupportFeatureProvider {
    /**
     * Returns the string for the disclaimer in the Support dialog
     */
-    String getDisclaimerString();
+    @StringRes
+    int getDisclaimerStringResId();
 }