Move protected broadcasts to Telephony

Protected broadcasts defined in rcsservice manifest
were still being flagged with WTFs. Moved to Telephony
Manifest.

Also cleaned up an old intent that is not used and
only use explicit intents for Alarm Receiver.

Bug: 76179999
Test: Manual, make sure WTF doesn't occur
Merged-In: Ie3667c8359c4050ab9558c990352ee0d1049480b
Change-Id: Id1c8b2bd7b89fcce64bfa214690447b3ca644928

2 files changed, 5 insertions, 25 deletions

diff --git a/rcs/rcsservice/AndroidManifest.xml b/rcs/rcsservice/AndroidManifest.xml
index 436f393..1d8ea4c 100644
--- a/rcs/rcsservice/AndroidManifest.xml
+++ b/rcs/rcsservice/AndroidManifest.xml
@@ -37,16 +37,6 @@
 
     <uses-sdk android:minSdkVersion="19"/>
 
-    <protected-broadcast android:name="com.android.ims.ACTION_RCS_SERVICE_AVAILABLE" />
-    <protected-broadcast android:name="com.android.ims.ACTION_RCS_SERVICE_UNAVAILABLE" />
-    <protected-broadcast android:name="com.android.ims.ACTION_RCS_SERVICE_DIED" />
-    <protected-broadcast android:name="com.android.ims.ACTION_PRESENCE_CHANGED" />
-    <protected-broadcast android:name="com.android.ims.ACTION_PUBLISH_STATUS_CHANGED" />
-    <protected-broadcast android:name="com.android.service.ims.presence.retry" />
-    <protected-broadcast android:name="com.android.service.ims.presence.task.timeout" />
-    <protected-broadcast android:name="com.android.service.ims.presence.ims-feature-status-changed" />
-    <protected-broadcast android:name="com.android.service.ims.presence.retry.publish" />
-
     <permission
         android:name="com.android.ims.rcs.permission.STATUS_CHANGED"
         android:protectionLevel="signatureOrSystem" />
@@ -83,12 +73,13 @@
             </intent-filter>
         </receiver>
 
+        <!-- Receives the following explicit intents:
+            - com.android.service.ims.presence.retry
+            - com.android.service.ims.presence.task.timeout
+            - com.android.service.ims.presence.retry.publish -->
         <receiver android:name="com.android.service.ims.presence.AlarmBroadcastReceiver"
             android:permission="com.android.ims.permission.PRESENCE_ACCESS"
-             androidprv:systemUserOnly="true">
-            <intent-filter>
-                <action android:name="com.android.service.ims.presence.retry" />
-            </intent-filter>
+            androidprv:systemUserOnly="true">
         </receiver>
     </application>
 </manifest>
diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java
index faf7f59..3e70cf9 100644
--- a/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java
+++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java
@@ -83,10 +83,6 @@ public class PresencePublication extends PresenceBase {
 
     private final Object mSyncObj = new Object();
 
-    final static String ACTION_IMS_FEATURE_AVAILABLE =
-            "com.android.service.ims.presence.ims-feature-status-changed";
-    private static final int INVALID_SERVICE_ID = -1;
-
     boolean mMovedToIWLAN = false;
     boolean mMovedToLTE = false;
     boolean mVoPSEnabled = false;
@@ -1108,13 +1104,6 @@ public class PresencePublication extends PresenceBase {
         finish();
     }
 
-    private PendingIntent createIncomingCallPendingIntent() {
-        Intent intent = new Intent(ACTION_IMS_FEATURE_AVAILABLE);
-        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-        return PendingIntent.getBroadcast(mContext, 0, intent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
-    }
-
     public void onFeatureCapabilityChanged(final int serviceClass,
             final int[] enabledFeatures, final int[] disabledFeatures) {
         logger.debug("onFeatureCapabilityChanged serviceClass="+serviceClass