Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a09b13c authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am a6683e0f: Reset app preferences now resets all app ops. 

* commit 'a6683e0f':
  Reset app preferences now resets all app ops.
parents 4dce3456 a6683e0f

res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -2624,6 +2624,7 @@ 
        <li>Disabled app notifications</li>\n

        <li>Default applications for actions</li>\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>

    <!-- [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>

src/com/android/settings/applications/ManageApplications.java

+5 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND; 
import android.app.Activity;

import android.app.ActivityManager;

import android.app.AlertDialog;

import android.app.AppOpsManager;

import android.app.Fragment;

import android.app.INotificationManager;

import android.content.ComponentName;
@@ -1120,6 +1121,8 @@ public class ManageApplications extends Fragment implements 
            final INotificationManager nm = INotificationManager.Stub.asInterface(

                    ServiceManager.getService(Context.NOTIFICATION_SERVICE));

            final NetworkPolicyManager npm = NetworkPolicyManager.from(getActivity());

            final AppOpsManager aom = (AppOpsManager)getActivity().getSystemService(

                    Context.APP_OPS_SERVICE);

            final Handler handler = new Handler(getActivity().getMainLooper());

            (new AsyncTask<Void, Void, Void>() {

                @Override protected Void doInBackground(Void... params) {
@@ -1146,6 +1149,7 @@ public class ManageApplications extends Fragment implements 
                        mIPm.resetPreferredActivities(UserHandle.myUserId());

                    } catch (RemoteException e) {

                    }

                    aom.resetAllModes();

                    final int[] restrictedUids = npm.getUidsWithPolicy(

                            POLICY_REJECT_METERED_BACKGROUND);

                    final int currentUserId = ActivityManager.getCurrentUser();