diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2012-06-11 11:49:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-11 11:49:46 -0700 |
| commit | d667aebfb34085960e2b41a2f52d10ae749ec44c (patch) | |
| tree | cc9ad93aab130fcb6b93a822669fef0891a3e93d /core/java | |
| parent | 926a5c507b2e532d1f1348dc8a5672b76ae1f4dc (diff) | |
| parent | dadc857d9de364fded10d4f69eb82bc9cd35d4b7 (diff) | |
| download | frameworks_base-d667aebfb34085960e2b41a2f52d10ae749ec44c.zip frameworks_base-d667aebfb34085960e2b41a2f52d10ae749ec44c.tar.gz frameworks_base-d667aebfb34085960e2b41a2f52d10ae749ec44c.tar.bz2 | |
Merge "VPN: move VpnDialogs away from system uid." into jb-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/net/VpnConfig.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/com/android/internal/net/VpnConfig.java b/core/java/com/android/internal/net/VpnConfig.java index d61a579..d6f9e07 100644 --- a/core/java/com/android/internal/net/VpnConfig.java +++ b/core/java/com/android/internal/net/VpnConfig.java @@ -34,17 +34,19 @@ public class VpnConfig implements Parcelable { public static final String SERVICE_INTERFACE = "android.net.VpnService"; + public static final String DIALOGS_PACKAGE = "com.android.vpndialogs"; + public static final String LEGACY_VPN = "[Legacy VPN]"; public static Intent getIntentForConfirmation() { Intent intent = new Intent(); - intent.setClassName("com.android.vpndialogs", "com.android.vpndialogs.ConfirmDialog"); + intent.setClassName(DIALOGS_PACKAGE, DIALOGS_PACKAGE + ".ConfirmDialog"); return intent; } public static PendingIntent getIntentForStatusPanel(Context context, VpnConfig config) { Intent intent = new Intent(); - intent.setClassName("com.android.vpndialogs", "com.android.vpndialogs.ManageDialog"); + intent.setClassName(DIALOGS_PACKAGE, DIALOGS_PACKAGE + ".ManageDialog"); intent.putExtra("config", config); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); |