Loading src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java +2 −3 Original line number Diff line number Diff line Loading @@ -36,7 +36,6 @@ import android.os.Message; import android.os.ParcelUuid; import android.os.PersistableBundle; import android.os.ServiceManager; import android.os.UserHandle; import android.permission.IPermissionManager; import android.preference.PreferenceManager; import android.provider.Settings; Loading Loading @@ -168,7 +167,7 @@ public class SubscriptionInfoUpdater extends Handler { // -Whenever new carrier privilege rules might change (new SIM is loaded) // -Whenever we switch to a new user mCurrentlyActiveUserId = 0; sContext.registerReceiverAsUser(new BroadcastReceiver() { sContext.registerReceiverForAllUsers(new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { // Remove this line after testing Loading @@ -180,7 +179,7 @@ public class SubscriptionInfoUpdater extends Handler { sContext.getContentResolver(), mCurrentlyActiveUserId); } } }, UserHandle.ALL, new IntentFilter(Intent.ACTION_USER_FOREGROUND), null, null); }, new IntentFilter(Intent.ACTION_USER_FOREGROUND), null, null); ActivityManager am = (ActivityManager) sContext.getSystemService(Context.ACTIVITY_SERVICE); mCurrentlyActiveUserId = am.getCurrentUser(); CarrierAppUtils.disableCarrierAppsUntilPrivileged(sContext.getOpPackageName(), Loading tests/telephonytests/src/com/android/internal/telephony/ContextFixture.java +7 −0 Original line number Diff line number Diff line Loading @@ -327,6 +327,13 @@ public class ContextFixture implements TestFixture<Context> { return registerReceiverAsUser(receiver, null, filter, broadcastPermission, scheduler); } @Override public Intent registerReceiverForAllUsers(BroadcastReceiver receiver, IntentFilter filter, String broadcastPermission, Handler scheduler) { return registerReceiverAsUser( receiver, UserHandle.ALL, filter, broadcastPermission, scheduler); } @Override public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user, IntentFilter filter, String broadcastPermission, Handler scheduler) { Loading Loading
src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java +2 −3 Original line number Diff line number Diff line Loading @@ -36,7 +36,6 @@ import android.os.Message; import android.os.ParcelUuid; import android.os.PersistableBundle; import android.os.ServiceManager; import android.os.UserHandle; import android.permission.IPermissionManager; import android.preference.PreferenceManager; import android.provider.Settings; Loading Loading @@ -168,7 +167,7 @@ public class SubscriptionInfoUpdater extends Handler { // -Whenever new carrier privilege rules might change (new SIM is loaded) // -Whenever we switch to a new user mCurrentlyActiveUserId = 0; sContext.registerReceiverAsUser(new BroadcastReceiver() { sContext.registerReceiverForAllUsers(new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { // Remove this line after testing Loading @@ -180,7 +179,7 @@ public class SubscriptionInfoUpdater extends Handler { sContext.getContentResolver(), mCurrentlyActiveUserId); } } }, UserHandle.ALL, new IntentFilter(Intent.ACTION_USER_FOREGROUND), null, null); }, new IntentFilter(Intent.ACTION_USER_FOREGROUND), null, null); ActivityManager am = (ActivityManager) sContext.getSystemService(Context.ACTIVITY_SERVICE); mCurrentlyActiveUserId = am.getCurrentUser(); CarrierAppUtils.disableCarrierAppsUntilPrivileged(sContext.getOpPackageName(), Loading
tests/telephonytests/src/com/android/internal/telephony/ContextFixture.java +7 −0 Original line number Diff line number Diff line Loading @@ -327,6 +327,13 @@ public class ContextFixture implements TestFixture<Context> { return registerReceiverAsUser(receiver, null, filter, broadcastPermission, scheduler); } @Override public Intent registerReceiverForAllUsers(BroadcastReceiver receiver, IntentFilter filter, String broadcastPermission, Handler scheduler) { return registerReceiverAsUser( receiver, UserHandle.ALL, filter, broadcastPermission, scheduler); } @Override public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user, IntentFilter filter, String broadcastPermission, Handler scheduler) { Loading