Merge cherrypicks of ['googleplex-android-review.googlesource.com/27179585',... (235cd4a5) · Commits · e / os / android_frameworks_base

core/jni/com_android_internal_os_Zygote.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -1828,10 +1828,10 @@ static void BindMountSyspropOverride(fail_fn_t fail_fn, JNIEnv* env) {
		std::string source = "/dev/__properties__/appcompat_override";
		std::string target = "/dev/__properties__";
		if (access(source.c_str(), F_OK) != 0) {
		fail_fn(CREATE_ERROR("Error accessing %s: %s", source.c_str(), strerror(errno)));
		return;
		}
		if (access(target.c_str(), F_OK) != 0) {
		fail_fn(CREATE_ERROR("Error accessing %s: %s", target.c_str(), strerror(errno)));
		return;
		}
		BindMount(source, target, fail_fn);
		// Reload the system properties file, to ensure new values are read into memory

+8 −8

Original line number	Diff line number	Diff line
		@@ -382,16 +382,16 @@ public class NotificationMediaManager implements Dumpable {

		private void clearCurrentMediaNotificationSession() {
		mMediaMetadata = null;
		mBackgroundExecutor.execute(() -> {
		if (mMediaController != null) {
		if (DEBUG_MEDIA) {
		Log.v(TAG, "DEBUG_MEDIA: Disconnecting from old controller: "
		+ mMediaController.getPackageName());
		}
		mBackgroundExecutor.execute(() -> {
		mMediaController.unregisterCallback(mMediaListener);
		mMediaController = null;
		});
		}
		});
		}

		public interface MediaListener {