Merge changes If96c0146,I0d68ad60 into oc-dev am: 5393a0e2d9

am: e1fcf8edd6 Change-Id: I59b73215058df60ad93e59a76f01143c6a935d30
2017-04-07 16:17:44 +00:00
parent a775faf40f e1fcf8edd6
commit 810d99e265
4 changed files with 16 additions and 4 deletions
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -3667,7 +3667,6 @@ public class Notification implements Parcelable
            contentView.setTextViewText(R.id.text, null);
            contentView.setViewVisibility(R.id.text_line_1, View.GONE);
            contentView.setTextViewText(R.id.text_line_1, null);
-            contentView.setViewVisibility(R.id.progress, View.GONE);
        }

        /**