Uninstall app through notif closes app settings.

Change-Id: I7887c7887b654c78a0fea16e898679e434fbeb53
Fixes: 62051546
Test: manual
This commit is contained in:
Beverly
2017-08-04 13:41:23 -04:00
committed by Beverly Tai
parent 48f8ab9bc9
commit 2aeff818c8

View File

@@ -35,8 +35,10 @@ import android.app.Notification;
import android.app.NotificationChannel; import android.app.NotificationChannel;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
@@ -108,6 +110,8 @@ abstract public class NotificationSettingsBase extends SettingsPreferenceFragmen
protected NotificationBackend.AppRow mAppRow; protected NotificationBackend.AppRow mAppRow;
protected boolean mShowLegacyChannelConfig = false; protected boolean mShowLegacyChannelConfig = false;
protected boolean mListeningToPackageRemove;
@Override @Override
public void onActivityCreated(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
@@ -159,6 +163,13 @@ abstract public class NotificationSettingsBase extends SettingsPreferenceFragmen
} }
mUserId = UserHandle.getUserId(mUid); mUserId = UserHandle.getUserId(mUid);
startListeningToPackageRemove();
}
@Override
public void onDestroy() {
stopListeningToPackageRemove();
super.onDestroy();
} }
@Override @Override
@@ -456,4 +467,38 @@ abstract public class NotificationSettingsBase extends SettingsPreferenceFragmen
return channel.isBlockableSystem() return channel.isBlockableSystem()
|| channel.getImportance() == NotificationManager.IMPORTANCE_NONE; || channel.getImportance() == NotificationManager.IMPORTANCE_NONE;
} }
protected void startListeningToPackageRemove() {
if (mListeningToPackageRemove) {
return;
}
mListeningToPackageRemove = true;
final IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_REMOVED);
filter.addDataScheme("package");
getContext().registerReceiver(mPackageRemovedReceiver, filter);
}
protected void stopListeningToPackageRemove() {
if (!mListeningToPackageRemove) {
return;
}
mListeningToPackageRemove = false;
getContext().unregisterReceiver(mPackageRemovedReceiver);
}
protected void onPackageRemoved() {
getActivity().finishAndRemoveTask();
}
protected final BroadcastReceiver mPackageRemovedReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
String packageName = intent.getData().getSchemeSpecificPart();
if (mPkgInfo == null || TextUtils.equals(mPkgInfo.packageName, packageName)) {
if (DEBUG) Log.d(TAG, "Package (" + packageName + ") removed. Removing"
+ "NotificationSettingsBase.");
onPackageRemoved();
}
}
};
} }