Merge tag 'android-5.1.0_r5' into HEAD (45ca1bac) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -130,7 +130,9 @@ public class MediaProjectionPermissionActivity extends Activity
		Log.e(TAG, "Error granting projection permission", e);
		setResult(RESULT_CANCELED);
		} finally {
		if (mDialog != null) {
		mDialog.dismiss();
		}
		finish();
		}
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ import android.service.notification.NotificationListenerService.RankingMap;
		import android.service.notification.StatusBarNotification;
		import android.text.TextUtils;
		import android.util.Log;
		import android.util.Slog;
		import android.util.SparseArray;
		import android.util.SparseBooleanArray;
		import android.view.Display;
		@@ -2211,6 +2212,14 @@ public abstract class BaseStatusBar extends SystemUI implements
		}

		public boolean isKeyguardSecure() {
		if (mStatusBarKeyguardViewManager == null) {
		// startKeyguard() hasn't been called yet, so we don't know.
		// Make sure anything that needs to know isKeyguardSecure() checks and re-checks this
		// value onVisibilityChanged().
		Slog.w(TAG, "isKeyguardSecure() called before startKeyguard(), returning false",
		new Throwable());
		return false;
		}
		return mStatusBarKeyguardViewManager.isSecure();
		}
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -273,6 +273,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL

		public void setPhoneStatusBar(PhoneStatusBar phoneStatusBar) {
		mPhoneStatusBar = phoneStatusBar;
		updateCameraVisibility(); // in case onFinishInflate() was called too early
		}

		private Intent getCameraIntent() {
		@@ -284,6 +285,10 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
		}

		private void updateCameraVisibility() {
		if (mCameraImageView == null) {
		// Things are not set up yet; reply hazy, ask again later
		return;
		}
		ResolveInfo resolved = mContext.getPackageManager().resolveActivityAsUser(getCameraIntent(),
		PackageManager.MATCH_DEFAULT_ONLY,
		mLockPatternUtils.getCurrentUser());
		@@ -355,7 +360,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
		private boolean isCameraDisabledByDpm() {
		final DevicePolicyManager dpm =
		(DevicePolicyManager) getContext().getSystemService(Context.DEVICE_POLICY_SERVICE);
		if (dpm != null) {
		if (dpm != null && mPhoneStatusBar != null) {
		try {
		final int userId = ActivityManagerNative.getDefault().getCurrentUser().id;
		final int disabledFlags = dpm.getKeyguardDisabledFeatures(null, userId);