PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't block notifications from system packages." into lmp-dev

Browse Source
This commit is contained in:
Dan Sandler
2014-09-04 13:15:47 +00:00
committed by Android (Google) Code Review
parent e1a164bf9b d283f0fbd5
commit feec34cec8
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/notification/AppNotificationSettings.java
View File

@@ -39,6 +39,7 @@ import android.widget.Toast;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.notification.NotificationAppList.AppRow; import com.android.settings.notification.NotificationAppList.AppRow;
import com.android.settings.notification.NotificationAppList.Backend; import com.android.settings.notification.NotificationAppList.Backend;
@@ -184,6 +185,12 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
} }
}); });
} }
// Users cannot block notifications from system/signature packages
if (Utils.isSystemPackage(pm, info)) {
getPreferenceScreen().removePreference(mBlock);
mPriority.setDependency(null); // don't have it depend on a preference that's gone
}
} }
private void toastAndFinish() { private void toastAndFinish() {
@@ -199,7 +206,7 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
final String p = packages[i]; final String p = packages[i];
if (pkg.equals(p)) { if (pkg.equals(p)) {
try { try {
return pm.getPackageInfo(pkg, 0); return pm.getPackageInfo(pkg, PackageManager.GET_SIGNATURES);
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
Log.w(TAG, "Failed to load package " + pkg, e); Log.w(TAG, "Failed to load package " + pkg, e);
} }

2
src/com/android/settings/notification/NotificationAppList.java
View File

@@ -351,7 +351,6 @@ public class NotificationAppList extends PinnedHeaderListFragment
public boolean priority; public boolean priority;
public boolean sensitive; public boolean sensitive;
public boolean first; // first app in section public boolean first; // first app in section
public boolean isSystem;
} }
private static final Comparator<AppRow> mRowComparator = new Comparator<AppRow>() { private static final Comparator<AppRow> mRowComparator = new Comparator<AppRow>() {
@@ -377,7 +376,6 @@ public class NotificationAppList extends PinnedHeaderListFragment
row.banned = backend.getNotificationsBanned(row.pkg, row.uid); row.banned = backend.getNotificationsBanned(row.pkg, row.uid);
row.priority = backend.getHighPriority(row.pkg, row.uid); row.priority = backend.getHighPriority(row.pkg, row.uid);
row.sensitive = backend.getSensitive(row.pkg, row.uid); row.sensitive = backend.getSensitive(row.pkg, row.uid);
row.isSystem = Utils.isSystemPackage(pm, pkg);
return row; return row;
} }