diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-11-06 09:01:20 -0800 |
|---|---|---|
| committer | Matt Garnes <matt@cyngn.com> | 2015-03-19 01:44:34 +0000 |
| commit | e162b74b597a926a83eba56fad08981d8db6bfb3 (patch) | |
| tree | a019f0958c5b38ee968304f4db2634f1b08a678b | |
| parent | 27ddcf08bb734cbd77b2f96d1ebd3b10fea71a5a (diff) | |
| download | android_packages_providers_TelephonyProvider-stable/cm-12.0-YNG1TA.tar.gz android_packages_providers_TelephonyProvider-stable/cm-12.0-YNG1TA.tar.bz2 android_packages_providers_TelephonyProvider-stable/cm-12.0-YNG1TA.zip | |
Make TelephonyProvider a singleton across usersstable/cm-12.0-YNG1TA
Messaging apps need to access it from secondary users
Bug: 18194892
Change-Id: Ia7401c287f4b920ac4de5102f33ded22bbf0f5b9
(cherry picked from commit bda9e4d340743d1a68d01bec29a44cba756b8ee1)
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/providers/telephony/TelephonyProvider.java | 11 |
2 files changed, 8 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 910655c..82461ad 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -32,6 +32,7 @@ <provider android:name="TelephonyProvider" android:authorities="telephony" android:exported="true" + android:singleUser="true" android:multiprocess="false" /> <!-- This is a singleton provider that is used by all users. diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java index e94817c..db09825 100644 --- a/src/com/android/providers/telephony/TelephonyProvider.java +++ b/src/com/android/providers/telephony/TelephonyProvider.java @@ -35,6 +35,7 @@ import android.database.sqlite.SQLiteQueryBuilder; import android.net.Uri; import android.os.Binder; import android.os.Environment; +import android.os.UserHandle; import android.provider.Telephony; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -1003,7 +1004,8 @@ public class TelephonyProvider extends ContentProvider } if (notify) { - getContext().getContentResolver().notifyChange(Telephony.Carriers.CONTENT_URI, null); + getContext().getContentResolver().notifyChange(Telephony.Carriers.CONTENT_URI, null, + true, UserHandle.USER_ALL); } return result; @@ -1116,7 +1118,8 @@ public class TelephonyProvider extends ContentProvider } if (count > 0) { - getContext().getContentResolver().notifyChange(Telephony.Carriers.CONTENT_URI, null); + getContext().getContentResolver().notifyChange(Telephony.Carriers.CONTENT_URI, null, + true, UserHandle.USER_ALL); } return count; @@ -1229,11 +1232,11 @@ public class TelephonyProvider extends ContentProvider switch (uriType) { case URL_SIMINFO: getContext().getContentResolver().notifyChange( - SubscriptionManager.CONTENT_URI, null); + SubscriptionManager.CONTENT_URI, null, true, UserHandle.USER_ALL); break; default: getContext().getContentResolver().notifyChange( - Telephony.Carriers.CONTENT_URI, null); + Telephony.Carriers.CONTENT_URI, null, true, UserHandle.USER_ALL); } } |