Merge "PendingIntent: Use rethrowFromSystemServer" (860d17d1) · Commits · e / os / android_frameworks_base

core/java/android/app/PendingIntent.java

+14 −22

Original line number	Original line	Diff line number	Diff line
	@@ -346,8 +346,8 @@ public final class PendingIntent implements Parcelable {
	flags, options, UserHandle.myUserId());		flags, options, UserHandle.myUserId());
	return target != null ? new PendingIntent(target) : null;		return target != null ? new PendingIntent(target) : null;
	} catch (RemoteException e) {		} catch (RemoteException e) {
			throw e.rethrowFromSystemServer();
	}		}
	return null;
	}		}

	/**		/**
	@@ -371,8 +371,8 @@ public final class PendingIntent implements Parcelable {
	flags, options, user.getIdentifier());		flags, options, user.getIdentifier());
	return target != null ? new PendingIntent(target) : null;		return target != null ? new PendingIntent(target) : null;
	} catch (RemoteException e) {		} catch (RemoteException e) {
			throw e.rethrowFromSystemServer();
	}		}
	return null;
	}		}

	/**		/**
	@@ -487,8 +487,8 @@ public final class PendingIntent implements Parcelable {
	UserHandle.myUserId());		UserHandle.myUserId());
	return target != null ? new PendingIntent(target) : null;		return target != null ? new PendingIntent(target) : null;
	} catch (RemoteException e) {		} catch (RemoteException e) {
			throw e.rethrowFromSystemServer();
	}		}
	return null;
	}		}

	/**		/**
	@@ -513,8 +513,8 @@ public final class PendingIntent implements Parcelable {
	flags, options, user.getIdentifier());		flags, options, user.getIdentifier());
	return target != null ? new PendingIntent(target) : null;		return target != null ? new PendingIntent(target) : null;
	} catch (RemoteException e) {		} catch (RemoteException e) {
			throw e.rethrowFromSystemServer();
	}		}
	return null;
	}		}

	/**		/**
	@@ -566,8 +566,8 @@ public final class PendingIntent implements Parcelable {
	flags, null, userHandle.getIdentifier());		flags, null, userHandle.getIdentifier());
	return target != null ? new PendingIntent(target) : null;		return target != null ? new PendingIntent(target) : null;
	} catch (RemoteException e) {		} catch (RemoteException e) {
			throw e.rethrowFromSystemServer();
	}		}
	return null;
	}		}

	/**		/**
	@@ -609,8 +609,8 @@ public final class PendingIntent implements Parcelable {
	flags, null, UserHandle.myUserId());		flags, null, UserHandle.myUserId());
	return target != null ? new PendingIntent(target) : null;		return target != null ? new PendingIntent(target) : null;
	} catch (RemoteException e) {		} catch (RemoteException e) {
			throw e.rethrowFromSystemServer();
	}		}
	return null;
	}		}

	/**		/**
	@@ -856,8 +856,7 @@ public final class PendingIntent implements Parcelable {
	return ActivityManager.getService()		return ActivityManager.getService()
	.getPackageForIntentSender(mTarget);		.getPackageForIntentSender(mTarget);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	// Should never happen.		throw e.rethrowFromSystemServer();
	return null;
	}		}
	}		}

	@@ -885,8 +884,7 @@ public final class PendingIntent implements Parcelable {
	return ActivityManager.getService()		return ActivityManager.getService()
	.getPackageForIntentSender(mTarget);		.getPackageForIntentSender(mTarget);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	// Should never happen.		throw e.rethrowFromSystemServer();
	return null;
	}		}
	}		}

	@@ -913,8 +911,7 @@ public final class PendingIntent implements Parcelable {
	return ActivityManager.getService()		return ActivityManager.getService()
	.getUidForIntentSender(mTarget);		.getUidForIntentSender(mTarget);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	// Should never happen.		throw e.rethrowFromSystemServer();
	return -1;
	}		}
	}		}

	@@ -945,8 +942,7 @@ public final class PendingIntent implements Parcelable {
	.getUidForIntentSender(mTarget);		.getUidForIntentSender(mTarget);
	return uid > 0 ? new UserHandle(UserHandle.getUserId(uid)) : null;		return uid > 0 ? new UserHandle(UserHandle.getUserId(uid)) : null;
	} catch (RemoteException e) {		} catch (RemoteException e) {
	// Should never happen.		throw e.rethrowFromSystemServer();
	return null;
	}		}
	}		}

	@@ -959,8 +955,7 @@ public final class PendingIntent implements Parcelable {
	return ActivityManager.getService()		return ActivityManager.getService()
	.isIntentSenderTargetedToPackage(mTarget);		.isIntentSenderTargetedToPackage(mTarget);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	// Should never happen.		throw e.rethrowFromSystemServer();
	return false;
	}		}
	}		}

	@@ -973,8 +968,7 @@ public final class PendingIntent implements Parcelable {
	return ActivityManager.getService()		return ActivityManager.getService()
	.isIntentSenderAnActivity(mTarget);		.isIntentSenderAnActivity(mTarget);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	// Should never happen.		throw e.rethrowFromSystemServer();
	return false;
	}		}
	}		}

	@@ -987,8 +981,7 @@ public final class PendingIntent implements Parcelable {
	return ActivityManager.getService()		return ActivityManager.getService()
	.getIntentForIntentSender(mTarget);		.getIntentForIntentSender(mTarget);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	// Should never happen.		throw e.rethrowFromSystemServer();
	return null;
	}		}
	}		}

	@@ -1001,8 +994,7 @@ public final class PendingIntent implements Parcelable {
	return ActivityManager.getService()		return ActivityManager.getService()
	.getTagForIntentSender(mTarget, prefix);		.getTagForIntentSender(mTarget, prefix);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	// Should never happen.		throw e.rethrowFromSystemServer();
	return null;
	}		}
	}		}