Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove BACKUP_DATA permission and associated checks"

Browse Source
This commit is contained in:
Chris Tate
2010-02-12 16:30:39 -08:00
committed by Android (Google) Code Review
parent d705fd2b0a a87240c227
commit cf36010357
5 changed files with 1 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/res/AndroidManifest.xml
View File

@@ -1161,13 +1161,6 @@
android:description="@string/permdesc_backup"
android:protectionLevel="signatureOrSystem" />
<!-- Allows an application to participate in the backup and restore process
@hide -->
<permission android:name="android.permission.BACKUP_DATA"
android:label="@string/permlab_backup_data"
android:description="@string/permdesc_backup_data"
android:protectionLevel="signatureOrSystem" />
<!-- Allows an application to tell the AppWidget service which application
can access AppWidget's data. The normal user flow is that a user
picks an AppWidget to go into a particular host, thereby giving that

5
core/res/res/values/strings.xml
View File

@@ -564,11 +564,6 @@
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permdesc_backup">Allows the application to control the system\'s backup and restore mechanism. Not for use by normal applications.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_backup_data">back up and restore the application\'s data</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permdesc_backup_data">Allows the application to participate in the system\'s backup and restore mechanism.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_internalSystemWindow">display unauthorized windows</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

2
packages/SettingsProvider/AndroidManifest.xml
View File

@@ -2,8 +2,6 @@
package="com.android.providers.settings"
android:sharedUserId="android.uid.system">
<uses-permission android:name="android.permission.BACKUP_DATA" />
<application android:allowClearUserData="false"
android:label="@string/app_label"
android:process="system"

19
services/java/com/android/server/BackupManagerService.java
View File

@@ -896,9 +896,7 @@ class BackupManagerService extends IBackupManager.Stub {
try {
ApplicationInfo app = pkg.applicationInfo;
if (((app.flags&ApplicationInfo.FLAG_ALLOW_BACKUP) == 0)
|| app.backupAgentName == null
|| (mPackageManager.checkPermission(android.Manifest.permission.BACKUP_DATA,
pkg.packageName) != PackageManager.PERMISSION_GRANTED)) {
|| app.backupAgentName == null) {
packages.remove(a);
}
else {
@@ -1282,15 +1280,6 @@ class BackupManagerService extends IBackupManager.Stub {
for (BackupRequest request : mQueue) {
Log.d(TAG, "starting agent for backup of " + request);
// Don't run backup, even if requested, if the target app does not have
// the requisite permission
if (mPackageManager.checkPermission(android.Manifest.permission.BACKUP_DATA,
request.appInfo.packageName) != PackageManager.PERMISSION_GRANTED) {
Log.w(TAG, "Skipping backup of unprivileged package "
+ request.appInfo.packageName);
continue;
}
IBackupAgent agent = null;
int mode = (request.fullBackup)
? IApplicationThread.BACKUP_MODE_FULL
@@ -1760,12 +1749,6 @@ class BackupManagerService extends IBackupManager.Stub {
if (DEBUG) Log.d(TAG, "processOneRestore packageName=" + packageName);
// Don't restore to unprivileged packages
if (mPackageManager.checkPermission(android.Manifest.permission.BACKUP_DATA,
packageName) != PackageManager.PERMISSION_GRANTED) {
Log.d(TAG, "Skipping restore of unprivileged package " + packageName);
}
// !!! TODO: get the dirs from the transport
File backupDataName = new File(mDataDir, packageName + ".restore");
File newStateName = new File(mStateDir, packageName + ".new");

1
tests/backup/AndroidManifest.xml
View File

@@ -1,6 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.backuptest">
<uses-permission android:name="android.permission.BACKUP_DATA" />
<application android:backupAgent="BackupTestAgent">
<activity android:name="BackupTestActivity" android:label="_BackupTest">
<intent-filter>