Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a6ecb61e: am c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev

Browse Source 
* commit 'a6ecb61ee7a87af7153f11289d7df1eb6f1beb67':
  RankingHelper: Remove STOPSHIP
This commit is contained in:
Christoph Studer
2014-12-04 21:46:32 +00:00
committed by Android Git Automerger
parent 9c403d8513 a6ecb61ee7
commit 51347595a3
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/notification/RankingHelper.java
View File

@@ -227,23 +227,8 @@ public class RankingHelper implements RankingConfig {
notificationList.get(i).setGlobalSortKey(null); notificationList.get(i).setGlobalSortKey(null);
} }
try { // rank each record individually
// rank each record individually Collections.sort(notificationList, mPreliminaryComparator);
Collections.sort(notificationList, mPreliminaryComparator);
} catch (RuntimeException ex) {
// Don't crash the system server if something bad happened.
Log.e(TAG, "Extreme badness during notification sort", ex);
Log.e(TAG, "Current notification list: ");
for (int i = 0; i < N; i++) {
NotificationRecord nr = notificationList.get(i);
Log.e(TAG, String.format(
" [%d] %s (group %s, rank %d, sortkey %s)",
i, nr, nr.getGroupKey(), nr.getAuthoritativeRank(),
nr.getNotification().getSortKey()));
}
// STOPSHIP: remove once b/16626175 is found
throw ex;
}
synchronized (mProxyByGroupTmp) { synchronized (mProxyByGroupTmp) {
// record individual ranking result and nominate proxies for each group // record individual ranking result and nominate proxies for each group