summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-01-25 09:08:55 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-01-25 09:08:55 -0800
commit49c47e4973650cdabf096c8ecb5ea483a5407c19 (patch)
tree83c5af4729af1d930990bbc3bf4c74ade0490f3d /src
parent77e7777b38408d4761a5cb2dead04cd8d08f67fc (diff)
parentaba7be3310997866b250d5f9d15fd7fe65fbac04 (diff)
downloadandroid_packages_apps_Gallery2-49c47e4973650cdabf096c8ecb5ea483a5407c19.tar.gz
android_packages_apps_Gallery2-49c47e4973650cdabf096c8ecb5ea483a5407c19.tar.bz2
android_packages_apps_Gallery2-49c47e4973650cdabf096c8ecb5ea483a5407c19.zip
Merge "Gallery2: Add sub_id on Settings.ACTION_APN_SETTINGS Intent."
Diffstat (limited to 'src')
-rwxr-xr-xsrc/org/codeaurora/gallery3d/video/SettingsActivity.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/org/codeaurora/gallery3d/video/SettingsActivity.java b/src/org/codeaurora/gallery3d/video/SettingsActivity.java
index 3d7fac573..aca446bf3 100755
--- a/src/org/codeaurora/gallery3d/video/SettingsActivity.java
+++ b/src/org/codeaurora/gallery3d/video/SettingsActivity.java
@@ -287,6 +287,7 @@ public class SettingsActivity extends PreferenceActivity {
private void setApnListener() {
final String SUBSCRIPTION_KEY = "subscription";
+ final String SUB_ID = "sub_id";
mApn.setSummary(getDefaultApnName());
mApn.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference preference) {
@@ -299,6 +300,7 @@ public class SettingsActivity extends PreferenceActivity {
Log.d("SettingActivity", "Can't get subscription for Exception: " + e);
} finally {
intent.putExtra(SUBSCRIPTION_KEY, subscription);
+ intent.putExtra(SUB_ID, subscription);
}
startActivityForResult(intent, SELECT_APN);
return true;