am 37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo

Merge commit '37d2f5d15b850830d65b1f68ebc95d5ba0612a46' into froyo-plus-aosp

* commit '37d2f5d15b850830d65b1f68ebc95d5ba0612a46':
  Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission.
This commit is contained in:
Jeff Brown
2010-04-08 22:39:19 -07:00
committed by Android Git Automerger

View File

@@ -304,9 +304,7 @@ public class RecoverySystem {
/**
* Reboots the device in order to install the given update
* package.
* Requires the {@link android.Manifest.permission#REBOOT}
* and {@link android.Manifest.permission#ACCESS_CACHE_FILESYSTEM}
* permissions.
* Requires the {@link android.Manifest.permission#REBOOT} permission.
*
* @param context the Context to use
* @param packageFile the update package to install. Currently
@@ -337,9 +335,7 @@ public class RecoverySystem {
* sometimes called a "factory reset", which is something of a
* misnomer because the system partition is not restored to its
* factory state.
* Requires the {@link android.Manifest.permission#REBOOT}
* and {@link android.Manifest.permission#ACCESS_CACHE_FILESYSTEM}
* permissions.
* Requires the {@link android.Manifest.permission#REBOOT} permission.
*
* @param context the Context to use
*