From 30ed7c7c72d13ab7a93ed7cd0a065b83f8475127 Mon Sep 17 00:00:00 2001
From: Ben Lin <linben@google.com>
Date: Thu, 13 Sep 2018 15:22:03 -0700
Subject: [PATCH] Follow up comments to
 0cdc103e8287d3bd01944cdd2afb5c11897998fe.

Bug: 74763823
Test: Manually check; sending an Intent with package:// scheme works, if
originated from app of same cert.

Change-Id: I8206197c2147cc91ef72ad89f330320781428bb9
---
 AndroidManifest.xml                                         | 6 +++---
 ...aultPage.java => InstalledAppOpenByDefaultActivity.java} | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename src/com/android/settings/applications/{InstalledAppOpenByDefaultPage.java => InstalledAppOpenByDefaultActivity.java} (93%)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c8d9afff9ef..71840b1ff09 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1128,12 +1128,12 @@
             </intent-filter>
         </activity-alias>
 
-        <activity android:name=".applications.InstalledAppOpenByDefaultPage"
+        <activity android:name=".applications.InstalledAppOpenByDefaultActivity"
                   android:label="@string/application_info_label"
-                  android:permission="android.permission.OPEN_APPLICATION_DETAILS_OPEN_BY_DEFAULT_PAGE"
+                  android:permission="android.permission.OPEN_APP_OPEN_BY_DEFAULT_SETTINGS"
                   android:exported="true">
             <intent-filter android:priority="1">
-                <action android:name="android.settings.APPLICATION_DETAILS_SETTINGS_OPEN_BY_DEFAULT_PAGE" />
+                <action android:name="com.android.settings.APP_OPEN_BY_DEFAULT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="package" />
             </intent-filter>
diff --git a/src/com/android/settings/applications/InstalledAppOpenByDefaultPage.java b/src/com/android/settings/applications/InstalledAppOpenByDefaultActivity.java
similarity index 93%
rename from src/com/android/settings/applications/InstalledAppOpenByDefaultPage.java
rename to src/com/android/settings/applications/InstalledAppOpenByDefaultActivity.java
index 40eef25840c..cd30d792efd 100644
--- a/src/com/android/settings/applications/InstalledAppOpenByDefaultPage.java
+++ b/src/com/android/settings/applications/InstalledAppOpenByDefaultActivity.java
@@ -20,7 +20,7 @@ import android.content.Intent;
 
 import com.android.settings.SettingsActivity;
 
-public class InstalledAppOpenByDefaultPage extends SettingsActivity {
+public class InstalledAppOpenByDefaultActivity extends SettingsActivity {
 
     @Override
     public Intent getIntent() {