Snap for 5817507 from 5c5a1d06cb38c3e12a77c5a2b747f169a342d11f to qt-qpr1-release (b3b8656b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/glwallpaper/EglHelper.java

+25 −3

Original line number	Diff line number	Diff line
		@@ -146,7 +146,13 @@ public class EglHelper {
		* @return true if EglSurface is ready.
		*/
		public boolean createEglSurface(SurfaceHolder surfaceHolder) {
		if (hasEglDisplay()) {
		mEglSurface = eglCreateWindowSurface(mEglDisplay, mEglConfig, surfaceHolder, null, 0);
		} else {
		Log.w(TAG, "mEglDisplay is null");
		return false;
		}

		if (mEglSurface == null \|\| mEglSurface == EGL_NO_SURFACE) {
		Log.w(TAG, "createWindowSurface failed: " + GLUtils.getEGLErrorString(eglGetError()));
		return false;
		@@ -186,7 +192,13 @@ public class EglHelper {
		public boolean createEglContext() {
		int[] attrib_list = new int[] {EGL_CONTEXT_CLIENT_VERSION, 2,
		EGL_CONTEXT_PRIORITY_LEVEL_IMG, EGL_CONTEXT_PRIORITY_LOW_IMG, EGL_NONE};
		if (hasEglDisplay()) {
		mEglContext = eglCreateContext(mEglDisplay, mEglConfig, EGL_NO_CONTEXT, attrib_list, 0);
		} else {
		Log.w(TAG, "mEglDisplay is null");
		return false;
		}

		if (mEglContext == EGL_NO_CONTEXT) {
		Log.w(TAG, "eglCreateContext failed: " + GLUtils.getEGLErrorString(eglGetError()));
		return false;
		@@ -212,6 +224,14 @@ public class EglHelper {
		return mEglContext != null;
		}

		/**
		* Check if we have EglDisplay.
		* @return true if EglDisplay is ready.
		*/
		public boolean hasEglDisplay() {
		return mEglDisplay != null;
		}

		/**
		* Swap buffer to display.
		* @return true if swap successfully.
		@@ -235,7 +255,9 @@ public class EglHelper {
		if (hasEglContext()) {
		destroyEglContext();
		}
		if (hasEglDisplay()) {
		eglTerminate(mEglDisplay);
		}
		mEglReady = false;
		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/DynamicPrivacyController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ public class DynamicPrivacyController implements UnlockMethodCache.OnUnlockMetho
		*/
		public boolean isInLockedDownShade() {
		if (!mStatusBarKeyguardViewManager.isShowing()
		\|\| !mStatusBarKeyguardViewManager.isSecure()) {
		\|\| !mUnlockMethodCache.isMethodSecure()) {
		return false;
		}
		int state = mStateController.getState();

packages/SystemUI/tests/src/com/android/systemui/glwallpaper/EglHelperTest.java

0 → 100644

+67 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.glwallpaper;

		import static org.junit.Assert.*;
		import static org.mockito.Mockito.RETURNS_DEFAULTS;
		import static org.mockito.Mockito.mock;

		import android.testing.AndroidTestingRunner;
		import android.testing.TestableLooper;
		import android.view.SurfaceHolder;

		import androidx.test.filters.SmallTest;

		import com.android.systemui.SysuiTestCase;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;


		@SmallTest
		@RunWith(AndroidTestingRunner.class)
		@TestableLooper.RunWithLooper
		public class EglHelperTest extends SysuiTestCase {

		@Mock
		private EglHelper mEglHelper;
		@Mock
		private SurfaceHolder mSurfaceHolder;

		@Before
		public void setUp() throws Exception {
		mEglHelper = mock(EglHelper.class, RETURNS_DEFAULTS);
		mSurfaceHolder = mock(SurfaceHolder.class, RETURNS_DEFAULTS);
		}

		@Test
		public void testInit_finish() {
		mEglHelper.init(mSurfaceHolder);
		mEglHelper.finish();
		}

		@Test
		public void testFinish_shouldNotCrash() {
		assertFalse(mEglHelper.hasEglDisplay());
		assertFalse(mEglHelper.hasEglSurface());
		assertFalse(mEglHelper.hasEglContext());

		mEglHelper.finish();
		}
		}

services/core/java/com/android/server/UiModeManagerService.java

+12 −6

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@ import android.os.ShellCallback;
		import android.os.ShellCommand;
		import android.os.SystemProperties;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.provider.Settings.Secure;
		import android.service.dreams.Sandman;
		import android.service.vr.IVrManager;
		@@ -218,6 +217,15 @@ final class UiModeManagerService extends SystemService {
		}
		};

		private final ContentObserver mDarkThemeObserver = new ContentObserver(mHandler) {
		@Override
		public void onChange(boolean selfChange, Uri uri) {
		final int mode = Secure.getIntForUser(getContext().getContentResolver(),
		Secure.UI_NIGHT_MODE, mNightMode, 0);
		SystemProperties.set(SYSTEM_PROPERTY_DEVICE_THEME, Integer.toString(mode));
		}
		};

		@Override
		public void onSwitchUser(int userHandle) {
		super.onSwitchUser(userHandle);
		@@ -293,6 +301,9 @@ final class UiModeManagerService extends SystemService {
		IntentFilter filter = new IntentFilter();
		filter.addAction(Intent.ACTION_USER_SWITCHED);
		context.registerReceiver(new UserSwitchedReceiver(), filter, null, mHandler);

		context.getContentResolver().registerContentObserver(Secure.getUriFor(Secure.UI_NIGHT_MODE),
		false, mDarkThemeObserver, 0);
		}

		// Records whether setup wizard has happened or not and adds an observer for this user if not.
		@@ -417,11 +428,6 @@ final class UiModeManagerService extends SystemService {
		if (!mCarModeEnabled) {
		Secure.putIntForUser(getContext().getContentResolver(),
		Secure.UI_NIGHT_MODE, mode, user);

		if (UserManager.get(getContext()).isPrimaryUser()) {
		SystemProperties.set(SYSTEM_PROPERTY_DEVICE_THEME,
		Integer.toString(mode));
		}
		}

		mNightMode = mode;

services/core/java/com/android/server/am/BatteryStatsService.java

+4 −11

Original line number	Diff line number	Diff line
		@@ -756,7 +756,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub
		}

		public void noteStartAudio(int uid) {
		enforceSelfOrCallingPermission(uid);
		enforceCallingPermission();
		synchronized (mStats) {
		mStats.noteAudioOnLocked(uid);
		StatsLog.write_non_chained(StatsLog.AUDIO_STATE_CHANGED, uid, null,
		@@ -765,7 +765,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub
		}

		public void noteStopAudio(int uid) {
		enforceSelfOrCallingPermission(uid);
		enforceCallingPermission();
		synchronized (mStats) {
		mStats.noteAudioOffLocked(uid);
		StatsLog.write_non_chained(StatsLog.AUDIO_STATE_CHANGED, uid, null,
		@@ -774,7 +774,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub
		}

		public void noteStartVideo(int uid) {
		enforceSelfOrCallingPermission(uid);
		enforceCallingPermission();
		synchronized (mStats) {
		mStats.noteVideoOnLocked(uid);
		StatsLog.write_non_chained(StatsLog.MEDIA_CODEC_STATE_CHANGED, uid, null,
		@@ -783,7 +783,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub
		}

		public void noteStopVideo(int uid) {
		enforceSelfOrCallingPermission(uid);
		enforceCallingPermission();
		synchronized (mStats) {
		mStats.noteVideoOffLocked(uid);
		StatsLog.write_non_chained(StatsLog.MEDIA_CODEC_STATE_CHANGED, uid,
		@@ -1184,13 +1184,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub
		Binder.getCallingPid(), Binder.getCallingUid(), null);
		}

		private void enforceSelfOrCallingPermission(int uid) {
		if (Binder.getCallingUid() == uid) {
		return;
		}
		enforceCallingPermission();
		}

		final class WakeupReasonThread extends Thread {
		private static final int MAX_REASON_SIZE = 512;
		private CharsetDecoder mDecoder;