openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix NPE in OverviewComponentObserver constructor while accessing activityInfo. 

Bug: 132461400
Test: Manual tests
Change-Id: Icee3730454db8129e597714c147c2cbaddc70987
(cherry picked from commit 219208a0f5)
This commit is contained in:
Rajeev Kumar 2019-06-17 11:35:03 -07:00 committed by Sunny Goyal
parent 700dc99d9b
commit 8ca7205c24
1 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
go/quickstep/src/com/android/quickstep/TouchInteractionService.java
View File

@ -19,15 +19,21 @@ import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYS
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.Service; import android.app.Service;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter;
import android.graphics.Region; import android.graphics.Region;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
import android.util.Log; import android.util.Log;
import android.view.MotionEvent; import android.view.MotionEvent;
import com.android.launcher3.Utilities;
import com.android.launcher3.compat.UserManagerCompat;
import com.android.systemui.shared.recents.IOverviewProxy; import com.android.systemui.shared.recents.IOverviewProxy;
import com.android.systemui.shared.recents.ISystemUiProxy; import com.android.systemui.shared.recents.ISystemUiProxy;
@ -37,7 +43,16 @@ import com.android.systemui.shared.recents.ISystemUiProxy;
@TargetApi(Build.VERSION_CODES.O) @TargetApi(Build.VERSION_CODES.O)
public class TouchInteractionService extends Service { public class TouchInteractionService extends Service {
private static final String TAG = "TouchInteractionService"; private static final String TAG = "GoTouchInteractionService";
private boolean mIsUserUnlocked;
private BroadcastReceiver mUserUnlockedReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
if (Intent.ACTION_USER_UNLOCKED.equals(intent.getAction())) {
initWhenUserUnlocked();
}
}
};
private final IBinder mMyBinder = new IOverviewProxy.Stub() { private final IBinder mMyBinder = new IOverviewProxy.Stub() {
@ -53,17 +68,21 @@ public class TouchInteractionService extends Service {
@Override @Override
public void onOverviewToggle() { public void onOverviewToggle() {
mOverviewCommandHelper.onOverviewToggle(); if (mIsUserUnlocked) {
mOverviewCommandHelper.onOverviewToggle();
}
} }
@Override @Override
public void onOverviewShown(boolean triggeredFromAltTab) { public void onOverviewShown(boolean triggeredFromAltTab) {
mOverviewCommandHelper.onOverviewShown(triggeredFromAltTab); if (mIsUserUnlocked) {
mOverviewCommandHelper.onOverviewShown(triggeredFromAltTab);
}
} }
@Override @Override
public void onOverviewHidden(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) { public void onOverviewHidden(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) {
if (triggeredFromAltTab && !triggeredFromHomeKey) { if (mIsUserUnlocked && triggeredFromAltTab && !triggeredFromHomeKey) {
// onOverviewShownFromAltTab hides the overview and ends at the target app // onOverviewShownFromAltTab hides the overview and ends at the target app
mOverviewCommandHelper.onOverviewHidden(); mOverviewCommandHelper.onOverviewHidden();
} }
@ -71,7 +90,9 @@ public class TouchInteractionService extends Service {
@Override @Override
public void onTip(int actionType, int viewType) { public void onTip(int actionType, int viewType) {
mOverviewCommandHelper.onTip(actionType, viewType); if (mIsUserUnlocked) {
mOverviewCommandHelper.onTip(actionType, viewType);
}
} }
@Override @Override
@ -123,17 +144,31 @@ public class TouchInteractionService extends Service {
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
mRecentsModel = RecentsModel.INSTANCE.get(this); if (UserManagerCompat.getInstance(this).isUserUnlocked(Process.myUserHandle())) {
mOverviewComponentObserver = new OverviewComponentObserver(this); initWhenUserUnlocked();
mOverviewCommandHelper = new OverviewCommandHelper(this, } else {
mOverviewComponentObserver); mIsUserUnlocked = false;
registerReceiver(mUserUnlockedReceiver, new IntentFilter(Intent.ACTION_USER_UNLOCKED));
}
sConnected = true; sConnected = true;
} }
private void initWhenUserUnlocked() {
mRecentsModel = RecentsModel.INSTANCE.get(this);
mOverviewComponentObserver = new OverviewComponentObserver(this);
mOverviewCommandHelper = new OverviewCommandHelper(this,
mOverviewComponentObserver);
mIsUserUnlocked = true;
Utilities.unregisterReceiverSafely(this, mUserUnlockedReceiver);
}
@Override @Override
public void onDestroy() { public void onDestroy() {
mOverviewComponentObserver.onDestroy(); if (mIsUserUnlocked) {
mOverviewComponentObserver.onDestroy();
}
Utilities.unregisterReceiverSafely(this, mUserUnlockedReceiver);
sConnected = false; sConnected = false;
super.onDestroy(); super.onDestroy();
} }