From a1300c84f63f6288616f8532f9cb3373ad130c7f Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Thu, 6 Apr 2017 17:52:32 -0700 Subject: [PATCH] Renaming intent action for unknown sources Renaming action MANAGE_EXTERNAL_SOURCES to MANAGE_UNKNOWN_APP_SOURCES to be clearer about its purpose Test: adb shell am instrument -w -e class \ com.android.settings.applications.ExternalSourcesSettingsTest \ com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner cts-tradefed run singleCommand cts -m ExternalSources Bug: 35812498 Change-Id: If38349f349781541673f93638e536a4f2a184bf6 --- api/current.txt | 2 +- api/system-current.txt | 2 +- api/test-current.txt | 2 +- core/java/android/content/pm/PackageManager.java | 2 +- core/java/android/provider/Settings.java | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/current.txt b/api/current.txt index fe35f617680a6..06488d706128b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -34921,8 +34921,8 @@ package android.provider { field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_DEFAULT_APPS_SETTINGS = "android.settings.MANAGE_DEFAULT_APPS_SETTINGS"; - field public static final java.lang.String ACTION_MANAGE_EXTERNAL_SOURCES = "android.settings.action.MANAGE_EXTERNAL_SOURCES"; field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION"; + field public static final java.lang.String ACTION_MANAGE_UNKNOWN_APP_SOURCES = "android.settings.action.MANAGE_UNKNOWN_APP_SOURCES"; field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS"; field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS"; field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS"; diff --git a/api/system-current.txt b/api/system-current.txt index e166eadc788a0..3204586f0e579 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -37969,8 +37969,8 @@ package android.provider { field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_DEFAULT_APPS_SETTINGS = "android.settings.MANAGE_DEFAULT_APPS_SETTINGS"; - field public static final java.lang.String ACTION_MANAGE_EXTERNAL_SOURCES = "android.settings.action.MANAGE_EXTERNAL_SOURCES"; field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION"; + field public static final java.lang.String ACTION_MANAGE_UNKNOWN_APP_SOURCES = "android.settings.action.MANAGE_UNKNOWN_APP_SOURCES"; field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS"; field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS"; field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS"; diff --git a/api/test-current.txt b/api/test-current.txt index 38897c86dbfcc..fbb9df484d628 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -35062,8 +35062,8 @@ package android.provider { field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_DEFAULT_APPS_SETTINGS = "android.settings.MANAGE_DEFAULT_APPS_SETTINGS"; - field public static final java.lang.String ACTION_MANAGE_EXTERNAL_SOURCES = "android.settings.action.MANAGE_EXTERNAL_SOURCES"; field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION"; + field public static final java.lang.String ACTION_MANAGE_UNKNOWN_APP_SOURCES = "android.settings.action.MANAGE_UNKNOWN_APP_SOURCES"; field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS"; field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS"; field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 50e3e6863d4f8..0d24b0d6f9cc2 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -6239,7 +6239,7 @@ public abstract class PackageManager { * @return true if the calling package is trusted by the user to request install packages on * the device, false otherwise. * @see {@link android.content.Intent#ACTION_INSTALL_PACKAGE} - * @see {@link android.provider.Settings#ACTION_MANAGE_EXTERNAL_SOURCES} + * @see {@link android.provider.Settings#ACTION_MANAGE_UNKNOWN_APP_SOURCES} */ public abstract boolean canRequestPackageInstalls(); diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 660d53a91b996..839d6c2d1c530 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -302,8 +302,8 @@ public final class Settings { * Output: Nothing. */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - public static final String ACTION_MANAGE_EXTERNAL_SOURCES = - "android.settings.action.MANAGE_EXTERNAL_SOURCES"; + public static final String ACTION_MANAGE_UNKNOWN_APP_SOURCES = + "android.settings.action.MANAGE_UNKNOWN_APP_SOURCES"; /** * Activity Action: Show trusted credentials settings, opening to the user tab,