Snap for 6656546 from 81d4133de97fc5d0ff261ea142130517b01f332e to rvc-qpr1-release (27c4329d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java

+21 −5

Original line number	Diff line number	Diff line
		@@ -265,9 +265,13 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic

		private void createDialog() {
		final boolean isDeviceManaged = mSecurityController.isDeviceManaged();
		boolean isProfileOwnerOfOrganizationOwnedDevice =
		mSecurityController.isProfileOwnerOfOrganizationOwnedDevice();
		final boolean hasWorkProfile = mSecurityController.hasWorkProfile();
		final CharSequence deviceOwnerOrganization =
		mSecurityController.getDeviceOwnerOrganizationName();
		final CharSequence workProfileOrganizationName =
		mSecurityController.getWorkProfileOrganizationName();
		final boolean hasCACerts = mSecurityController.hasCACertInCurrentUser();
		final boolean hasCACertsInWorkProfile = mSecurityController.hasCACertInWorkProfile();
		final boolean isNetworkLoggingEnabled = mSecurityController.isNetworkLoggingEnabled();
		@@ -284,7 +288,8 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic

		// device management section
		CharSequence managementMessage = getManagementMessage(isDeviceManaged,
		deviceOwnerOrganization);
		deviceOwnerOrganization, isProfileOwnerOfOrganizationOwnedDevice,
		workProfileOrganizationName);
		if (managementMessage == null) {
		dialogView.findViewById(R.id.device_management_disclosures).setVisibility(View.GONE);
		} else {
		@@ -292,8 +297,12 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic
		TextView deviceManagementWarning =
		(TextView) dialogView.findViewById(R.id.device_management_warning);
		deviceManagementWarning.setText(managementMessage);
		// Don't show the policies button for profile owner of org owned device, because there
		// is no policies settings screen for it
		if (!isProfileOwnerOfOrganizationOwnedDevice) {
		mDialog.setButton(DialogInterface.BUTTON_NEGATIVE, getSettingsButton(), this);
		}
		}

		// ca certificate section
		CharSequence caCertsMessage = getCaCertsMessage(isDeviceManaged, hasCACerts,
		@@ -382,11 +391,18 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic
		}

		protected CharSequence getManagementMessage(boolean isDeviceManaged,
		CharSequence organizationName) {
		if (!isDeviceManaged) return null;
		if (organizationName != null)
		CharSequence organizationName, boolean isProfileOwnerOfOrganizationOwnedDevice,
		CharSequence workProfileOrganizationName) {
		if (!isDeviceManaged && !isProfileOwnerOfOrganizationOwnedDevice) {
		return null;
		}
		if (isDeviceManaged && organizationName != null) {
		return mContext.getString(
		R.string.monitoring_description_named_management, organizationName);
		} else if (isProfileOwnerOfOrganizationOwnedDevice && workProfileOrganizationName != null) {
		return mContext.getString(
		R.string.monitoring_description_named_management, workProfileOrganizationName);
		}
		return mContext.getString(R.string.monitoring_description_management);
		}

packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java

+218 −227

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -102,7 +102,7 @@ public class TakeScreenshotService extends Service {

		switch (msg.what) {
		case WindowManager.TAKE_SCREENSHOT_FULLSCREEN:
		mScreenshot.takeScreenshot(uriConsumer, onComplete);
		mScreenshot.takeScreenshotFullscreen(uriConsumer, onComplete);
		break;
		case WindowManager.TAKE_SCREENSHOT_SELECTED_REGION:
		mScreenshot.takeScreenshotPartial(uriConsumer, onComplete);

packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java

+37 −4

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/wm/ActivityRecord.java

+25 −13

File changed.

Preview size limit exceeded, changes collapsed.