commit ac12bae569c20dc9257291b7c2dcaa16da220b80
author Jordan Liu <jminjie@google.com> Thu Nov 21 11:59:07 2019 -0800
committer Jordan Liu <jminjie@google.com> Fri Nov 22 15:43:06 2019 -0800
tree 3380af17ffd7e5ca9e07fb981a51fa874be8f06c
parent 75f25840ca5a7bba7a4c90bc10fbbdb75f281a9e

Remove UnsupportedAppUsage, use correct State* classes

Also do not use Build.IS_DEBUGGABLE, update jarjar rules, make sure
public versions of methods are being called, inline putPhoneIdAndSubId
methods.

Bug: 135956699
Test: manual
Change-Id: Id620c4c7c4c74cf304def7cb5779285762760035

cellbroadcast-jarjar-rules.txt

diff --git a/cellbroadcast-jarjar-rules.txt b/cellbroadcast-jarjar-rules.txt
index 9d34267..3e4127a 100644
--- a/cellbroadcast-jarjar-rules.txt
+++ b/cellbroadcast-jarjar-rules.txt
@@ -1 +1,6 @@
+rule android.os.HandlerExecutor* com.android.cellbroadcastservice.HandlerExecutor@1
 rule android.util.LocalLog* com.android.cellbroadcastservice.LocalLog@1
+rule android.internal.util.IState* com.android.cellbroadcastservice.IState@1
+rule android.internal.util.Preconditions* com.android.cellbroadcastservice.Preconditions@1
+rule android.internal.util.State* com.android.cellbroadcastservice.State@1
+rule android.internal.util.StateMachine* com.android.cellbroadcastservice.StateMachine@1