commit d270c1e883f09bc067b186d0320ded93b5a76d67
author Brad Ebinger <breadley@google.com> Thu Jun 07 11:59:53 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 07 11:59:53 2018 -0700
tree 94c79a31ac7bccf54cd024b73d3d910aa1e5ad9f
parent e1c915a2a4c56bd8bb64c089cfc2b0ad5f214501
parent 4ec55aea90e8724275d4f91a36c2aa3d47c72776

Move protected broadcasts to Telephony
am: 4ec55aea90

Change-Id: If1501258713a40f33369849d0aa5d1b7de73342f

rcs/rcsservice/AndroidManifest.xml

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>

rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java

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 @@
 
     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 @@
         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