diff options
| author | John Spurlock <jspurlock@google.com> | 2013-03-12 15:38:18 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2013-03-12 15:38:18 -0400 |
| commit | 5ddc19957fb83cbc890c082052d008066b1f6518 (patch) | |
| tree | b61a65cd22ac06b495552288e0889e5eb1718f81 /src/com/android/settings/DreamBackend.java | |
| parent | 9471675c0a280e23186977434efdd0db0ab5bf9d (diff) | |
| download | packages_apps_Settings-5ddc19957fb83cbc890c082052d008066b1f6518.zip packages_apps_Settings-5ddc19957fb83cbc890c082052d008066b1f6518.tar.gz packages_apps_Settings-5ddc19957fb83cbc890c082052d008066b1f6518.tar.bz2 | |
Relative component names for dream settings activities.
If no package name is provided when declaring a dream settings
activity, use the dream service component package name.
Bug:8370189
Change-Id: I36fabc4e7f10fe7deb5bd7a670c66b2c23d5fc20
Diffstat (limited to 'src/com/android/settings/DreamBackend.java')
| -rw-r--r-- | src/com/android/settings/DreamBackend.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/DreamBackend.java b/src/com/android/settings/DreamBackend.java index 70124ef..1522705 100644 --- a/src/com/android/settings/DreamBackend.java +++ b/src/com/android/settings/DreamBackend.java @@ -277,6 +277,9 @@ public class DreamBackend { Log.w(TAG, "Error parsing : " + resolveInfo.serviceInfo.packageName, caughtException); return null; } + if (cn != null && cn.indexOf('/') < 0) { + cn = resolveInfo.serviceInfo.packageName + "/" + cn; + } return cn == null ? null : ComponentName.unflattenFromString(cn); } |