Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 670b8b59: am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev

Browse Source 
* commit '670b8b597131c35cbd742d94ee1d22ace5d06e51':
  Fix tuner for secondary users
This commit is contained in:
Jason Monk
2015-08-12 18:09:24 +00:00
committed by Android Git Automerger
parent b689d776bb 670b8b5971
commit 36ea805f1e
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SystemUI/src/com/android/systemui/tuner/TunerService.java
View File

@@ -16,7 +16,6 @@
package com.android.systemui.tuner; package com.android.systemui.tuner;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.AlertDialog;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.ContentResolver; import android.content.ContentResolver;
@@ -25,10 +24,12 @@ import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener; import android.content.DialogInterface.OnClickListener;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.net.Uri; import android.net.Uri;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.util.ArrayMap; import android.util.ArrayMap;
@@ -169,6 +170,7 @@ public class TunerService extends SystemUI {
public static final void showResetRequest(final Context context, final Runnable onDisabled) { public static final void showResetRequest(final Context context, final Runnable onDisabled) {
SystemUIDialog dialog = new SystemUIDialog(context); SystemUIDialog dialog = new SystemUIDialog(context);
dialog.setShowForAllUsers(true);
dialog.setMessage(R.string.remove_from_settings_prompt); dialog.setMessage(R.string.remove_from_settings_prompt);
dialog.setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.cancel), dialog.setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.cancel),
(OnClickListener) null); (OnClickListener) null);
@@ -192,7 +194,7 @@ public class TunerService extends SystemUI {
} }
public static final void setTunerEnabled(Context context, boolean enabled) { public static final void setTunerEnabled(Context context, boolean enabled) {
context.getPackageManager().setComponentEnabledSetting( userContext(context).getPackageManager().setComponentEnabledSetting(
new ComponentName(context, TunerActivity.class), new ComponentName(context, TunerActivity.class),
enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
: PackageManager.COMPONENT_ENABLED_STATE_DISABLED, : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
@@ -200,11 +202,20 @@ public class TunerService extends SystemUI {
} }
public static final boolean isTunerEnabled(Context context) { public static final boolean isTunerEnabled(Context context) {
return context.getPackageManager().getComponentEnabledSetting( return userContext(context).getPackageManager().getComponentEnabledSetting(
new ComponentName(context, TunerActivity.class)) new ComponentName(context, TunerActivity.class))
== PackageManager.COMPONENT_ENABLED_STATE_ENABLED; == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
} }
private static Context userContext(Context context) {
try {
return context.createPackageContextAsUser(context.getPackageName(), 0,
new UserHandle(ActivityManager.getCurrentUser()));
} catch (NameNotFoundException e) {
return context;
}
}
private class Observer extends ContentObserver { private class Observer extends ContentObserver {
public Observer() { public Observer() {
super(new Handler(Looper.getMainLooper())); super(new Handler(Looper.getMainLooper()));