Merge "CTS of CtsMediaTestCases#android.media.cts.DecodeAccuracyTest may fail when video is cropped. When we use GPU to copy the data, rendering would choose filter. But we need add shrink in border to ensure the sampler not reach border like what GUI does."
diff --git a/core/java/Android.bp b/core/java/Android.bp
index 949ba6a..3b2d883 100644
--- a/core/java/Android.bp
+++ b/core/java/Android.bp
@@ -332,12 +332,7 @@
filegroup {
name: "framework-cellbroadcast-shared-srcs",
srcs: [
- "android/os/HandlerExecutor.java",
"android/util/LocalLog.java",
- "com/android/internal/util/IState.java",
- "com/android/internal/util/Preconditions.java",
- "com/android/internal/util/State.java",
- "com/android/internal/util/StateMachine.java",
],
}
diff --git a/services/net/java/android/net/ConnectivityModuleConnector.java b/services/net/java/android/net/ConnectivityModuleConnector.java
index 62f2c35..c6b15c1 100644
--- a/services/net/java/android/net/ConnectivityModuleConnector.java
+++ b/services/net/java/android/net/ConnectivityModuleConnector.java
@@ -278,7 +278,10 @@
// This code path is only run by the system server: only the system server binds
// to the NetworkStack as a service. Other processes get the NetworkStack from
// the ServiceManager.
- maybeCrashWithTerribleFailure("Lost network stack", mPackageName);
+ maybeCrashWithTerribleFailure(
+ "Lost network stack. This is not the root cause of any issue, it is a side "
+ + "effect of a crash that happened earlier. Earlier logs should point to the "
+ + "actual issue.", mPackageName);
}
}