Merge "Ensure TelecomServiceImpl uses System API when checking isSameApp." into main (189e840a) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/TelecomServiceImpl.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -1490,14 +1490,18 @@ public class TelecomServiceImpl {
		private boolean isPrivilegedUid() {
		int callingUid = Binder.getCallingUid();
		return mFeatureFlags.allowSystemAppsResolveVoipCalls()
		? (UserHandle.isSameApp(callingUid, Process.ROOT_UID)
		\|\| UserHandle.isSameApp(callingUid, Process.SYSTEM_UID)
		\|\| UserHandle.isSameApp(callingUid, Process.SHELL_UID))
		? (isSameApp(callingUid, Process.ROOT_UID)
		\|\| isSameApp(callingUid, Process.SYSTEM_UID)
		\|\| isSameApp(callingUid, Process.SHELL_UID))
		: (callingUid == Process.ROOT_UID
		\|\| callingUid == Process.SYSTEM_UID
		\|\| callingUid == Process.SHELL_UID);
		}

		private boolean isSameApp(int uid1, int uid2) {
		return UserHandle.getAppId(uid1) == UserHandle.getAppId(uid2);
		}

		private boolean isSysUiUid() {
		int callingUid = Binder.getCallingUid();
		int systemUiUid;
		@@ -1506,7 +1510,7 @@ public class TelecomServiceImpl {
		systemUiUid = mPackageManager.getPackageUid(mSystemUiPackageName, 0);
		Log.i(TAG, "isSysUiUid: callingUid = " + callingUid + "; systemUiUid = "
		+ systemUiUid);
		return UserHandle.isSameApp(callingUid, systemUiUid);
		return isSameApp(callingUid, systemUiUid);
		} catch (PackageManager.NameNotFoundException e) {
		Log.w(TAG, "isSysUiUid: caught PackageManager NameNotFoundException = " + e);
		return false;