Merge "HIDD: Fix the logic in unregisterApp()" (92790707) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/hid/HidDeviceService.java

+5 −10

Original line number	Diff line number	Diff line
		@@ -531,15 +531,7 @@ public class HidDeviceService extends ProfileService {
		}

		int callingUid = Binder.getCallingUid();

		if (callingUid == mUserUid \|\| callingUid < Process.FIRST_APPLICATION_UID) {
		mUserUid = 0;
		return mHidDeviceNativeInterface.unregisterApp();
		}
		if (DBG) {
		Log.d(TAG, "unregisterAppUid(): caller UID doesn't match user UID");
		}
		return false;
		return unregisterAppUid(callingUid);
		}

		private synchronized boolean unregisterAppUid(int uid) {
		@@ -547,10 +539,13 @@ public class HidDeviceService extends ProfileService {
		Log.d(TAG, "unregisterAppUid(): uid=" + uid);
		}

		if (uid == mUserUid) {
		if (mUserUid != 0 && (uid == mUserUid \|\| uid < Process.FIRST_APPLICATION_UID)) {
		mUserUid = 0;
		return mHidDeviceNativeInterface.unregisterApp();
		}
		if (DBG) {
		Log.d(TAG, "unregisterAppUid(): caller UID doesn't match user UID");
		}
		return false;
		}