resolved conflicts for merge of c8911ddd to master

Change-Id: I790b547268a23848577199256fc5abc9bdb7abb8

diff --cc core/java/android/app/AppOpsManager.java
index 0f988ed,4fcb18a..fe09ce1
--- 1/core/java/android/app/AppOpsManager.java
--- 2/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@@ -527,12 -422,14 +527,20 @@@ public class AppOpsManager 
          }
      }
  
+     /** @hide */
+     public void resetAllModes() {
+         try {
+             mService.resetAllModes();
+         } catch (RemoteException e) {
+         }
+     }
+ 
 +    /**
 +     * Monitor for changes to the operating mode for the given op in the given app package.
 +     * @param op The operation to monitor, one of OP_*.
 +     * @param packageName The name of the application to monitor.
 +     * @param callback Where to report changes.
 +     */
      public void startWatchingMode(int op, String packageName, final Callback callback) {
          synchronized (mModeWatchers) {
              IAppOpsCallback cb = mModeWatchers.get(callback);

diff --cc core/java/com/android/internal/app/IAppOpsService.aidl
Simple merge

diff --cc services/java/com/android/server/AppOpsService.java
index 6b4d248,20ad636..81572c5
--- 1/services/java/com/android/server/AppOpsService.java
--- 2/services/java/com/android/server/AppOpsService.java
+++ b/services/java/com/android/server/AppOpsService.java
@@@ -40,9 -41,9 +41,10 @@@ import android.os.Process
  import android.os.RemoteException;
  import android.os.ServiceManager;
  import android.os.UserHandle;
 +import android.util.ArrayMap;
  import android.util.AtomicFile;
  import android.util.Log;
+ import android.util.Pair;
  import android.util.Slog;
  import android.util.SparseArray;
  import android.util.TimeUtils;