diff options
| author | Roopa Sattiraju <sattiraju@google.com> | 2021-11-05 21:23:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-05 21:23:39 +0000 |
| commit | b39c550a580cf78306f2a3622f20a7ac65d94816 (patch) | |
| tree | 64fe45602629f7f122fb3c3ec4885139f947320e /core/java/android | |
| parent | 7a9cff05c9d2e3eaee5857f059324cb5d7f278b6 (diff) | |
| parent | c11076edb35c1053609da2a61e41f14485b617e2 (diff) | |
Merge "Change getEnabledComponentOverrides return type" am: 30cd5df67f am: 3374e0478a am: 27d3253e54 am: 802dd06c6b am: c11076edb3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1853043
Change-Id: Icf59fba3efa0a665198066c1f813746a0489d1ea
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/ISystemConfig.aidl | 4 | ||||
| -rw-r--r-- | core/java/android/os/SystemConfigManager.java | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/os/ISystemConfig.aidl b/core/java/android/os/ISystemConfig.aidl index d83d94a8ec77..15e3ce25122b 100644 --- a/core/java/android/os/ISystemConfig.aidl +++ b/core/java/android/os/ISystemConfig.aidl @@ -16,6 +16,8 @@ package android.os; +import android.content.ComponentName; + /** * Binder interface to query SystemConfig in the system server. * {@hide} @@ -44,5 +46,5 @@ interface ISystemConfig { /** * @see SystemConfigManager#getEnabledComponentOverrides */ - List<String> getEnabledComponentOverrides(String packageName); + List<ComponentName> getEnabledComponentOverrides(String packageName); } diff --git a/core/java/android/os/SystemConfigManager.java b/core/java/android/os/SystemConfigManager.java index a6316df0780c..cde2063fdba5 100644 --- a/core/java/android/os/SystemConfigManager.java +++ b/core/java/android/os/SystemConfigManager.java @@ -17,10 +17,10 @@ package android.os; import android.Manifest; import android.annotation.NonNull; -import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; +import android.content.ComponentName; import android.content.Context; import android.util.ArraySet; import android.util.Log; @@ -138,9 +138,9 @@ public class SystemConfigManager { * @return The enabled component * {@hide} */ - @SystemApi + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) @NonNull - public List<String> getEnabledComponentOverrides(@NonNull String packageName) { + public List<ComponentName> getEnabledComponentOverrides(@NonNull String packageName) { try { return mInterface.getEnabledComponentOverrides(packageName); } catch (RemoteException e) { |