Merge "SystemUI: stop using IPackageManager::isOnlyCoreApps()" into tm-qpr-dev (1f3a3014) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+0 −17

Original line number	Diff line number	Diff line
		@@ -86,7 +86,6 @@ import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.pm.IPackageManager;
		import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.content.pm.UserInfo;
		@@ -110,7 +109,6 @@ import android.os.Looper;
		import android.os.Message;
		import android.os.PowerManager;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.SystemClock;
		import android.os.Trace;
		import android.os.UserHandle;
		@@ -274,21 +272,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		private static final ComponentName FALLBACK_HOME_COMPONENT = new ComponentName(
		"com.android.settings", "com.android.settings.FallbackHome");

		/**
		* If true, the system is in the half-boot-to-decryption-screen state.
		* Prudently disable lockscreen.
		*/
		public static final boolean CORE_APPS_ONLY;

		static {
		try {
		CORE_APPS_ONLY = IPackageManager.Stub.asInterface(
		ServiceManager.getService("package")).isOnlyCoreApps();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		private final Context mContext;
		private final UserTracker mUserTracker;
		private final KeyguardUpdateMonitorLogger mLogger;

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -1912,12 +1912,6 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		* Enable the keyguard if the settings are appropriate.
		*/
		private void doKeyguardLocked(Bundle options) {
		if (KeyguardUpdateMonitor.CORE_APPS_ONLY) {
		// Don't show keyguard during half-booted cryptkeeper stage.
		if (DEBUG) Log.d(TAG, "doKeyguard: not showing because booting to cryptkeeper");
		return;
		}

		// if another app is disabling us, don't show
		if (!mExternallyEnabled) {
		if (DEBUG) Log.d(TAG, "doKeyguard: not showing because externally disabled");

packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -23,8 +23,6 @@ import static android.inputmethodservice.InputMethodService.IME_INVISIBLE;
		import static android.view.Display.DEFAULT_DISPLAY;
		import static android.view.Display.INVALID_DISPLAY;

		import static com.android.systemui.statusbar.phone.CentralSurfacesImpl.ONLY_CORE_APPS;

		import android.annotation.Nullable;
		import android.app.ITransientNotificationCallback;
		import android.app.StatusBarManager;
		@@ -544,8 +542,7 @@ public class CommandQueue extends IStatusBar.Stub implements
		final int disabled1 = getDisabled1(DEFAULT_DISPLAY);
		final int disabled2 = getDisabled2(DEFAULT_DISPLAY);
		return (disabled1 & StatusBarManager.DISABLE_EXPAND) == 0
		&& (disabled2 & StatusBarManager.DISABLE2_NOTIFICATION_SHADE) == 0
		&& !ONLY_CORE_APPS;
		&& (disabled2 & StatusBarManager.DISABLE2_NOTIFICATION_SHADE) == 0;
		}

		@Override

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+1 −21

Original line number	Diff line number	Diff line
		@@ -64,7 +64,6 @@ import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.pm.IPackageManager;
		import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.content.res.Configuration;
		@@ -292,24 +291,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {

		private static final UiEventLogger sUiEventLogger = new UiEventLoggerImpl();

		/**
		* If true, the system is in the half-boot-to-decryption-screen state.
		* Prudently disable QS and notifications.
		*/
		public static final boolean ONLY_CORE_APPS;

		static {
		boolean onlyCoreApps;
		try {
		IPackageManager packageManager =
		IPackageManager.Stub.asInterface(ServiceManager.getService("package"));
		onlyCoreApps = packageManager != null && packageManager.isOnlyCoreApps();
		} catch (RemoteException e) {
		onlyCoreApps = false;
		}
		ONLY_CORE_APPS = onlyCoreApps;
		}

		private final Context mContext;
		private final LockscreenShadeTransitionController mLockscreenShadeTransitionController;
		private final DeviceStateManager mDeviceStateManager;
		@@ -1702,8 +1683,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		\|\| !mUserSwitcherController.isSimpleUserSwitcher())
		&& !isShadeDisabled()
		&& ((mDisabled2 & StatusBarManager.DISABLE2_QUICK_SETTINGS) == 0)
		&& !mDozing
		&& !ONLY_CORE_APPS;
		&& !mDozing;
		mNotificationPanelViewController.setQsExpansionEnabledPolicy(expandEnabled);
		Log.d(TAG, "updateQsExpansionEnabled - QS Expand enabled: " + expandEnabled);
		}