Merge "Fix crashes after notifying bad notification" into nyc-mr1-dev (d517c3c1) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+17 −17

Original line number	Diff line number	Diff line
		@@ -1706,12 +1706,6 @@ public abstract class BaseStatusBar extends SystemUI implements
		sbn.getPackageContext(mContext),
		contentContainerPublic, mOnClickHandler);
		}
		}
		catch (RuntimeException e) {
		final String ident = sbn.getPackageName() + "/0x" + Integer.toHexString(sbn.getId());
		Log.e(TAG, "couldn't inflate view for notification " + ident, e);
		return false;
		}

		if (contentViewLocal != null) {
		contentViewLocal.setIsRootNamespace(true);
		@@ -1729,6 +1723,12 @@ public abstract class BaseStatusBar extends SystemUI implements
		publicViewLocal.setIsRootNamespace(true);
		contentContainerPublic.setContractedChild(publicViewLocal);
		}
		}
		catch (RuntimeException e) {
		final String ident = sbn.getPackageName() + "/0x" + Integer.toHexString(sbn.getId());
		Log.e(TAG, "couldn't inflate view for notification " + ident, e);
		return false;
		}

		// Extract target SDK version.
		try {