| commit | 57d537123186ba9ed8feb72bb52d60bcecddccbf | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Wed Jul 18 10:44:10 2018 -0400 |
| committer | Jason Monk <jmonk@google.com> | Wed Jul 18 10:44:10 2018 -0400 |
| tree | 5ca057c709ff4cef14bed58ccd7367d4780df304 | |
| parent | cf0b12711057a2a23dc08f1ac6acfe67892b945d [diff] |
Don't make Settings' content providers no release. Test: Settings no longer in memory Bug: 110985973 Change-Id: I80570ad52cd986083d735c1b6c0d8b34d7feb58f
diff --git a/services/core/java/com/android/server/am/ContentProviderRecord.java b/services/core/java/com/android/server/am/ContentProviderRecord.java index cd39bcd..69ef570 100644 --- a/services/core/java/com/android/server/am/ContentProviderRecord.java +++ b/services/core/java/com/android/server/am/ContentProviderRecord.java
@@ -62,7 +62,8 @@ appInfo = ai; name = _name; singleton = _singleton; - noReleaseNeeded = uid == 0 || uid == Process.SYSTEM_UID; + noReleaseNeeded = (uid == 0 || uid == Process.SYSTEM_UID) + && (_name == null || !"com.android.settings".equals(_name.getPackageName())); } public ContentProviderRecord(ContentProviderRecord cpr) {