diff options
| author | 2018-07-18 17:10:12 -0700 | |
|---|---|---|
| committer | 2018-07-18 17:10:12 -0700 | |
| commit | 69ce2e9444fc7a96ee67c4ff51e9ad38d0840bd8 (patch) | |
| tree | a9ab4c1faf9fb45f0c9e075e9481664e3abcf1a0 | |
| parent | 0678660c8d425532ba06b0320343c05bc70a78c7 (diff) | |
| parent | c93ab691d37dd3492447b21dd0999226fd48f4df (diff) | |
Merge "Don't make Settings' content providers no release." into pi-dev
am: c93ab691d3
Change-Id: Ifabcb4890086da8ac7ef4cd4d4cc3cf530750a43
| -rw-r--r-- | services/core/java/com/android/server/am/ContentProviderRecord.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ContentProviderRecord.java b/services/core/java/com/android/server/am/ContentProviderRecord.java index cd39bcd03d36..69ef570c63af 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 @@ final class ContentProviderRecord implements ComponentName.WithComponentName { 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) { |