PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ad38b60b: am 0a09b13c: am a6683e0f: Reset app preferences now resets all app ops.

Browse Source 
* commit 'ad38b60b372314f6266381207bd82144f21b1027':
  Reset app preferences now resets all app ops.
This commit is contained in:
Dianne Hackborn
2013-08-03 00:10:16 -07:00
committed by Android Git Automerger
parent 84dea9e038 ad38b60b37
commit 2500f7a3f5
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/strings.xml
View File

@@ -2647,6 +2647,7 @@
<li>Disabled app notifications</li>\n <li>Disabled app notifications</li>\n
<li>Default applications for actions</li>\n <li>Default applications for actions</li>\n
<li>Background data restrictions for apps</li>\n\n <li>Background data restrictions for apps</li>\n\n
<li>Any permission restrictions</li>\n\n
You will not lose any app data.</string> You will not lose any app data.</string>
<!-- [CHAR LIMIT=25] Manage applications screen, menu item. Confirmation button of dialog to confirm resetting user's app preferences. --> <!-- [CHAR LIMIT=25] Manage applications screen, menu item. Confirmation button of dialog to confirm resetting user's app preferences. -->
<string name="reset_app_preferences_button">Reset apps</string> <string name="reset_app_preferences_button">Reset apps</string>

6
src/com/android/settings/applications/ManageApplications.java
View File

@@ -22,6 +22,7 @@ import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.AppOpsManager;
import android.app.Fragment; import android.app.Fragment;
import android.app.INotificationManager; import android.app.INotificationManager;
import android.content.ComponentName; import android.content.ComponentName;
@@ -1116,10 +1117,12 @@ public class ManageApplications extends Fragment implements
if (mResetDialog == dialog) { if (mResetDialog == dialog) {
final PackageManager pm = getActivity().getPackageManager(); final PackageManager pm = getActivity().getPackageManager();
final IPackageManager mIPm = IPackageManager.Stub.asInterface( final IPackageManager mIPm = IPackageManager.Stub.asInterface(
ServiceManager.getService("package")); ServiceManager.getService("package"));
final INotificationManager nm = INotificationManager.Stub.asInterface( final INotificationManager nm = INotificationManager.Stub.asInterface(
ServiceManager.getService(Context.NOTIFICATION_SERVICE)); ServiceManager.getService(Context.NOTIFICATION_SERVICE));
final NetworkPolicyManager npm = NetworkPolicyManager.from(getActivity()); final NetworkPolicyManager npm = NetworkPolicyManager.from(getActivity());
final AppOpsManager aom = (AppOpsManager)getActivity().getSystemService(
Context.APP_OPS_SERVICE);
final Handler handler = new Handler(getActivity().getMainLooper()); final Handler handler = new Handler(getActivity().getMainLooper());
(new AsyncTask<Void, Void, Void>() { (new AsyncTask<Void, Void, Void>() {
@Override protected Void doInBackground(Void... params) { @Override protected Void doInBackground(Void... params) {
@@ -1146,6 +1149,7 @@ public class ManageApplications extends Fragment implements
mIPm.resetPreferredActivities(UserHandle.myUserId()); mIPm.resetPreferredActivities(UserHandle.myUserId());
} catch (RemoteException e) { } catch (RemoteException e) {
} }
aom.resetAllModes();
final int[] restrictedUids = npm.getUidsWithPolicy( final int[] restrictedUids = npm.getUidsWithPolicy(
POLICY_REJECT_METERED_BACKGROUND); POLICY_REJECT_METERED_BACKGROUND);
final int currentUserId = ActivityManager.getCurrentUser(); final int currentUserId = ActivityManager.getCurrentUser();