Addition of jarjar rules.
Bug: 137202333
Test: Compilation
Test: Scripts to verify correct usage of rules
Change-Id: Ifda90110ac19b3725c5b466d86b7da1abeb33b01
Merged-In: Ifda90110ac19b3725c5b466d86b7da1abeb33b01
diff --git a/Android.bp b/Android.bp
index e8946da..fa2aace 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,12 +38,15 @@
],
srcs: [
+ ":framework-telephony-stack-shared-srcs",
"src/**/*.java",
"sip/src/**/*.java",
"ecc/proto/**/*.proto",
"src/com/android/phone/EventLogTags.logtags",
],
+ jarjar_rules: ":jarjar-rules-shared",
+
resource_dirs: [
"res",
"sip/res",
diff --git a/src/com/android/services/telephony/PstnIncomingCallNotifier.java b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
index f397dce..2dfeaed 100644
--- a/src/com/android/services/telephony/PstnIncomingCallNotifier.java
+++ b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
@@ -41,8 +41,6 @@
import com.android.phone.NumberVerificationManager;
import com.android.phone.PhoneUtils;
-import com.google.common.base.Preconditions;
-
import java.util.Objects;
/**
@@ -96,7 +94,9 @@
* @param phone The phone object for listening to incoming calls.
*/
PstnIncomingCallNotifier(Phone phone) {
- Preconditions.checkNotNull(phone);
+ if (phone == null) {
+ throw new NullPointerException();
+ }
mPhone = phone;
diff --git a/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java b/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java
index b9cbf6e..4038dd1 100644
--- a/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java
+++ b/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java
@@ -21,7 +21,6 @@
import android.os.Message;
import com.android.internal.telephony.Phone;
-import com.android.internal.util.Preconditions;
/**
* Listens to phone's capabilities changed event and notifies Telecomm. One instance of these exists
@@ -55,7 +54,9 @@
/*package*/
PstnPhoneCapabilitiesNotifier(Phone phone, Listener listener) {
- Preconditions.checkNotNull(phone);
+ if (phone == null) {
+ throw new NullPointerException();
+ }
mPhone = phone;
mListener = listener;