Merge "Make setServer() safe to call multiple times" (f0d019c4) · Commits · e / os / android_frameworks_base

media/java/android/mtp/MtpDatabase.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -202,12 +202,17 @@ public class MtpDatabase {
		public void setServer(MtpServer server) {
		mServer = server;

		// always unregister before registering
		try {
		mContext.unregisterReceiver(mBatteryReceiver);
		} catch (IllegalArgumentException e) {
		// wasn't previously registered, ignore
		}

		// register for battery notifications when we are connected
		if (server != null) {
		mContext.registerReceiver(mBatteryReceiver,
		new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
		} else {
		mContext.unregisterReceiver(mBatteryReceiver);
		}
		}