Merge change 6102 into donut (0d81f636) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ public class SettingsBackupAgent extends BackupHelperAgent {
		data.writeEntityHeader(KEY_SYNC, syncProviders.length);
		data.writeEntityData(syncProviders, syncProviders.length);

		//TODO: Permissions problem : backupFile(FILE_WIFI_SUPPLICANT, data);
		backupFile(FILE_WIFI_SUPPLICANT, data);
		}

		@Override

+12 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ import android.os.Message;
		import android.os.PowerManager;
		import android.os.Process;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.provider.Settings;
		import android.util.Log;
		import android.text.TextUtils;
		@@ -64,6 +65,7 @@ import java.io.FileDescriptor;
		import java.io.PrintWriter;

		import com.android.internal.app.IBatteryStats;
		import android.backup.IBackupManager;
		import com.android.server.am.BatteryStatsService;

		/**
		@@ -1436,6 +1438,16 @@ public class WifiService extends IWifiManager.Stub {
		}
		}
		}
		// Inform the backup manager about a data change
		IBackupManager ibm = IBackupManager.Stub.asInterface(
		ServiceManager.getService(Context.BACKUP_SERVICE));
		if (ibm != null) {
		try {
		ibm.dataChanged("com.android.providers.settings");
		} catch (Exception e) {
		// Try again later
		}
		}
		return result;
		}