Make @Implementation methods added since 3.7 release protected
Piper CL: 189244369
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivityManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivityManager.java
index 25e26b7..3d9b163 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivityManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivityManager.java
@@ -67,7 +67,7 @@
/** Returns information seeded by {@link #setProcesses}. */
@Implementation
- public static void getMyMemoryState(ActivityManager.RunningAppProcessInfo inState) {
+ protected static void getMyMemoryState(ActivityManager.RunningAppProcessInfo inState) {
fillInProcessInfo(inState);
for (ActivityManager.RunningAppProcessInfo info : processes) {
if (info.pid == Process.myPid()) {
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMeasuredParagraph.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMeasuredParagraph.java
index 7164656..cebfce6 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMeasuredParagraph.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMeasuredParagraph.java
@@ -12,7 +12,7 @@
private static int nativeCounter = 0;
@Implementation
- public static long nInitBuilder() {
+ protected static long nInitBuilder() {
return ++nativeCounter;
}
}
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMeasuredText.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMeasuredText.java
index d5835a2..8ccfa13 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMeasuredText.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMeasuredText.java
@@ -11,7 +11,7 @@
private static int nativeCounter = 0;
@Implementation
- public static long nInitBuilder() {
+ protected static long nInitBuilder() {
return ++nativeCounter;
}
}
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSettings.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSettings.java
index 8c8c44c..0dedf0d 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSettings.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSettings.java
@@ -162,7 +162,7 @@
/** @return `false` by default, or the value specified via {@link #setCanDrawOverlays(boolean)} */
@Implementation(minSdk = M)
- public static boolean canDrawOverlays(Context context) {
+ protected static boolean canDrawOverlays(Context context) {
return canDrawOverlays;
}
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowStaticLayout.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowStaticLayout.java
index c4278d6..917cf75 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowStaticLayout.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowStaticLayout.java
@@ -3,6 +3,7 @@
import static android.os.Build.VERSION_CODES.LOLLIPOP;
import static android.os.Build.VERSION_CODES.LOLLIPOP_MR1;
import static android.os.Build.VERSION_CODES.M;
+import static android.os.Build.VERSION_CODES.P;
import android.text.StaticLayout;
import org.robolectric.annotation.HiddenApi;
@@ -25,9 +26,9 @@
return 1;
}
- @Implementation(minSdk = android.os.Build.VERSION_CODES.P)
+ @Implementation(minSdk = P)
@HiddenApi
- public static int nComputeLineBreaks(
+ protected static int nComputeLineBreaks(
Object nativePtr,
Object text,
Object measuredTextPtr,
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTypeface.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTypeface.java
index b3bffec..1949745 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTypeface.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTypeface.java
@@ -99,7 +99,7 @@
}
@Implementation(minSdk = P)
- public static void buildSystemFallback(String xmlPath, String fontDir,
+ protected static void buildSystemFallback(String xmlPath, String fontDir,
ArrayMap<String, Typeface> fontMap, ArrayMap<String, FontFamily[]> fallbackMap) {
fontMap.put("sans-serif", createUnderlyingTypeface("sans-serif", 0));
}
