Team-Radium
diff --git a/‎core/java/android/os/RecoverySystem.java‎
Lines changed: 7 additions & 0 deletions b/‎core/java/android/os/RecoverySystem.java‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎services/core/java/com/android/server/MasterClearReceiver.java‎
Lines changed: 2 additions & 0 deletions b/‎services/core/java/com/android/server/MasterClearReceiver.java‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java‎
Lines changed: 2 additions & 0 deletions b/‎services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java‎
Lines changed: 2 additions & 0 deletions
@@ -19,6 +19,7 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.os.UserManager;
 import android.util.Log;
 
 import java.io.ByteArrayInputStream;
@@ -348,6 +349,7 @@ public static void installPackage(Context context, File packageFile)
      *
      * @throws IOException  if writing the recovery command file
      * fails, or if the reboot itself fails.
+     * @throws SecurityException if the current user is not allowed to wipe data.
      */
     public static void rebootWipeUserData(Context context) throws IOException {
         rebootWipeUserData(context, false);
@@ -367,11 +369,16 @@ public static void rebootWipeUserData(Context context) throws IOException {
      *
      * @throws IOException  if writing the recovery command file
      * fails, or if the reboot itself fails.
+     * @throws SecurityException if the current user is not allowed to wipe data.
      *
      * @hide
      */
     public static void rebootWipeUserData(Context context, boolean shutdown)
         throws IOException {
+        UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        if (um.hasUserRestriction(UserManager.DISALLOW_FACTORY_RESET)) {
+            throw new SecurityException("Wiping data is not allowed for this user.");
+        }
         final ConditionVariable condition = new ConditionVariable();
 
         Intent intent = new Intent("android.intent.action.MASTER_CLEAR_NOTIFICATION");
 
@@ -49,6 +49,8 @@ public void run() {
                     Log.wtf(TAG, "Still running after master clear?!");
                 } catch (IOException e) {
                     Slog.e(TAG, "Can't perform master clear/factory reset", e);
+                } catch (SecurityException e) {
+                    Slog.e(TAG, "Can't perform master clear/factory reset", e);
                 }
             }
         };
 
@@ -2480,6 +2480,8 @@ void wipeDataLocked(int flags) {
                 RecoverySystem.rebootWipeUserData(mContext);
             } catch (IOException e) {
                 Slog.w(LOG_TAG, "Failed requesting data wipe", e);
+            } catch (SecurityException e) {
+                Slog.w(LOG_TAG, "Failed requesting data wipe", e);
             }
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ public void run() {`
`49`	`49`	`Log.wtf(TAG, "Still running after master clear?!");`
`50`	`50`	`} catch (IOException e) {`
`51`	`51`	`Slog.e(TAG, "Can't perform master clear/factory reset", e);`
	`52`	`+ } catch (SecurityException e) {`
	`53`	`+ Slog.e(TAG, "Can't perform master clear/factory reset", e);`
`52`	`54`	`}`
`53`	`55`	`}`
`54`	`56`	`};`
Original file line number	Diff line number	Diff line change
`@@ -2480,6 +2480,8 @@ void wipeDataLocked(int flags) {`
`2480`	`2480`	`RecoverySystem.rebootWipeUserData(mContext);`
`2481`	`2481`	`} catch (IOException e) {`
`2482`	`2482`	`Slog.w(LOG_TAG, "Failed requesting data wipe", e);`
	`2483`	`+ } catch (SecurityException e) {`
	`2484`	`+ Slog.w(LOG_TAG, "Failed requesting data wipe", e);`
`2483`	`2485`	`}`
`2484`	`2486`	`}`
`2485`	`2487`	`}`