Snap for 7714994 from 2195d4448f4b06f5f0933cf72bad225169565acd to sc-qpr1-release (fa9d95fc) · Commits · e / os / android_frameworks_base

core/java/android/view/Surface.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,7 @@ public class Surface implements Parcelable {

		private static native int nativeSetFrameRate(
		long nativeObject, float frameRate, int compatibility, int changeFrameRateStrategy);
		private static native void nativeDestroy(long nativeObject);

		public static final @android.annotation.NonNull Parcelable.Creator<Surface> CREATOR =
		new Parcelable.Creator<Surface>() {
		@@ -339,6 +340,9 @@ public class Surface implements Parcelable {
		*/
		@UnsupportedAppUsage
		public void destroy() {
		if (mNativeObject != 0) {
		nativeDestroy(mNativeObject);
		}
		release();
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -903,7 +903,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		mSurfaceAlpha = 1f;

		synchronized (mSurfaceControlLock) {
		mSurface.release();
		mSurface.destroy();
		if (mBlastBufferQueue != null) {
		mBlastBufferQueue.destroy();
		mBlastBufferQueue = null;

+6 −0

Original line number	Diff line number	Diff line
		@@ -449,6 +449,11 @@ static jint nativeSetFrameRate(JNIEnv* env, jclass clazz, jlong nativeObject, jf
		int(changeFrameRateStrategy));
		}

		static void nativeDestroy(JNIEnv* env, jclass clazz, jlong nativeObject) {
		sp<Surface> surface(reinterpret_cast<Surface*>(nativeObject));
		surface->destroy();
		}

		// ----------------------------------------------------------------------------

		static const JNINativeMethod gSurfaceMethods[] = {
		@@ -477,6 +482,7 @@ static const JNINativeMethod gSurfaceMethods[] = {
		{"nativeSetAutoRefreshEnabled", "(JZ)I", (void*)nativeSetAutoRefreshEnabled},
		{"nativeSetFrameRate", "(JFII)I", (void*)nativeSetFrameRate},
		{"nativeGetFromBlastBufferQueue", "(JJ)J", (void*)nativeGetFromBlastBufferQueue},
		{"nativeDestroy", "(J)V", (void*)nativeDestroy},
		};

		int register_android_view_Surface(JNIEnv* env)

+2 −2

Original line number	Diff line number	Diff line
		@@ -29,8 +29,8 @@
		android:textSize="@dimen/smart_reply_button_font_size"
		android:lineSpacingExtra="@dimen/smart_reply_button_line_spacing_extra"
		android:textColor="@color/smart_reply_button_text"
		android:paddingStart="@dimen/smart_reply_button_action_padding_left"
		android:paddingEnd="@dimen/smart_reply_button_padding_horizontal"
		android:paddingLeft="@dimen/smart_reply_button_action_padding_left"
		android:paddingRight="@dimen/smart_reply_button_padding_horizontal"
		android:drawablePadding="@dimen/smart_action_button_icon_padding"
		android:textStyle="normal"
		android:ellipsize="none"/>

+2 −2

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@
		android:textSize="@dimen/smart_reply_button_font_size"
		android:lineSpacingExtra="@dimen/smart_reply_button_line_spacing_extra"
		android:textColor="@color/smart_reply_button_text"
		android:paddingStart="@dimen/smart_reply_button_padding_horizontal"
		android:paddingEnd="@dimen/smart_reply_button_padding_horizontal"
		android:paddingLeft="@dimen/smart_reply_button_padding_horizontal"
		android:paddingRight="@dimen/smart_reply_button_padding_horizontal"
		android:textStyle="normal"
		android:ellipsize="none"/>