SystemUI: stop using IPackageManager::isOnlyCoreApps()
Due to the removal of support for Full Disk Encryption, this method always returns false. In preparation for removing it, stop calling it from SystemUI. Bug: 208476087 Change-Id: I5b9de5667780388d19c1b3addae2124c35400ed2
This commit is contained in:
@@ -50,7 +50,6 @@ import android.content.ComponentName;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.IntentFilter;
|
import android.content.IntentFilter;
|
||||||
import android.content.pm.IPackageManager;
|
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.content.pm.ResolveInfo;
|
import android.content.pm.ResolveInfo;
|
||||||
import android.content.pm.UserInfo;
|
import android.content.pm.UserInfo;
|
||||||
@@ -233,21 +232,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|
|||||||
private static final ComponentName FALLBACK_HOME_COMPONENT = new ComponentName(
|
private static final ComponentName FALLBACK_HOME_COMPONENT = new ComponentName(
|
||||||
"com.android.settings", "com.android.settings.FallbackHome");
|
"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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public final boolean mRequestActiveUnlockOnAssistant;
|
public final boolean mRequestActiveUnlockOnAssistant;
|
||||||
public final boolean mRequestActiveUnlockOnWakeup;
|
public final boolean mRequestActiveUnlockOnWakeup;
|
||||||
public final boolean mInitiateActiveUnlockOnWakeup;
|
public final boolean mInitiateActiveUnlockOnWakeup;
|
||||||
|
|||||||
@@ -1744,12 +1744,6 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
|
|||||||
* Enable the keyguard if the settings are appropriate.
|
* Enable the keyguard if the settings are appropriate.
|
||||||
*/
|
*/
|
||||||
private void doKeyguardLocked(Bundle options) {
|
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 another app is disabling us, don't show
|
||||||
if (!mExternallyEnabled) {
|
if (!mExternallyEnabled) {
|
||||||
if (DEBUG) Log.d(TAG, "doKeyguard: not showing because externally disabled");
|
if (DEBUG) Log.d(TAG, "doKeyguard: not showing because externally disabled");
|
||||||
|
|||||||
@@ -23,8 +23,6 @@ import static android.inputmethodservice.InputMethodService.IME_INVISIBLE;
|
|||||||
import static android.view.Display.DEFAULT_DISPLAY;
|
import static android.view.Display.DEFAULT_DISPLAY;
|
||||||
import static android.view.Display.INVALID_DISPLAY;
|
import static android.view.Display.INVALID_DISPLAY;
|
||||||
|
|
||||||
import static com.android.systemui.statusbar.phone.CentralSurfaces.ONLY_CORE_APPS;
|
|
||||||
|
|
||||||
import android.annotation.Nullable;
|
import android.annotation.Nullable;
|
||||||
import android.app.ITransientNotificationCallback;
|
import android.app.ITransientNotificationCallback;
|
||||||
import android.app.StatusBarManager;
|
import android.app.StatusBarManager;
|
||||||
@@ -514,8 +512,7 @@ public class CommandQueue extends IStatusBar.Stub implements
|
|||||||
final int disabled1 = getDisabled1(DEFAULT_DISPLAY);
|
final int disabled1 = getDisabled1(DEFAULT_DISPLAY);
|
||||||
final int disabled2 = getDisabled2(DEFAULT_DISPLAY);
|
final int disabled2 = getDisabled2(DEFAULT_DISPLAY);
|
||||||
return (disabled1 & StatusBarManager.DISABLE_EXPAND) == 0
|
return (disabled1 & StatusBarManager.DISABLE_EXPAND) == 0
|
||||||
&& (disabled2 & StatusBarManager.DISABLE2_NOTIFICATION_SHADE) == 0
|
&& (disabled2 & StatusBarManager.DISABLE2_NOTIFICATION_SHADE) == 0;
|
||||||
&& !ONLY_CORE_APPS;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -64,7 +64,6 @@ import android.content.ComponentName;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.IntentFilter;
|
import android.content.IntentFilter;
|
||||||
import android.content.pm.IPackageManager;
|
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.content.pm.PackageManager.NameNotFoundException;
|
import android.content.pm.PackageManager.NameNotFoundException;
|
||||||
import android.content.pm.ResolveInfo;
|
import android.content.pm.ResolveInfo;
|
||||||
@@ -329,29 +328,11 @@ public class CentralSurfaces extends CoreStartable implements
|
|||||||
public static final int[] CAMERA_LAUNCH_GESTURE_VIBRATION_AMPLITUDES =
|
public static final int[] CAMERA_LAUNCH_GESTURE_VIBRATION_AMPLITUDES =
|
||||||
new int[]{39, 82, 139, 213, 0, 127};
|
new int[]{39, 82, 139, 213, 0, 127};
|
||||||
|
|
||||||
/**
|
|
||||||
* 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;
|
|
||||||
|
|
||||||
/** If true, the lockscreen will show a distinct wallpaper */
|
/** If true, the lockscreen will show a distinct wallpaper */
|
||||||
public static final boolean ENABLE_LOCKSCREEN_WALLPAPER = true;
|
public static final boolean ENABLE_LOCKSCREEN_WALLPAPER = true;
|
||||||
|
|
||||||
private static final UiEventLogger sUiEventLogger = new UiEventLoggerImpl();
|
private static final UiEventLogger sUiEventLogger = new UiEventLoggerImpl();
|
||||||
|
|
||||||
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 LockscreenShadeTransitionController mLockscreenShadeTransitionController;
|
private final LockscreenShadeTransitionController mLockscreenShadeTransitionController;
|
||||||
private final DreamOverlayStateController mDreamOverlayStateController;
|
private final DreamOverlayStateController mDreamOverlayStateController;
|
||||||
private CentralSurfacesCommandQueueCallbacks mCommandQueueCallbacks;
|
private CentralSurfacesCommandQueueCallbacks mCommandQueueCallbacks;
|
||||||
@@ -1653,8 +1634,7 @@ public class CentralSurfaces extends CoreStartable implements
|
|||||||
|| !mUserSwitcherController.isSimpleUserSwitcher())
|
|| !mUserSwitcherController.isSimpleUserSwitcher())
|
||||||
&& !isShadeDisabled()
|
&& !isShadeDisabled()
|
||||||
&& ((mDisabled2 & StatusBarManager.DISABLE2_QUICK_SETTINGS) == 0)
|
&& ((mDisabled2 & StatusBarManager.DISABLE2_QUICK_SETTINGS) == 0)
|
||||||
&& !mDozing
|
&& !mDozing;
|
||||||
&& !ONLY_CORE_APPS;
|
|
||||||
mNotificationPanelViewController.setQsExpansionEnabledPolicy(expandEnabled);
|
mNotificationPanelViewController.setQsExpansionEnabledPolicy(expandEnabled);
|
||||||
Log.d(TAG, "updateQsExpansionEnabled - QS Expand enabled: " + expandEnabled);
|
Log.d(TAG, "updateQsExpansionEnabled - QS Expand enabled: " + expandEnabled);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user