Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
packages_apps_TvSettings
Commits
51809e4c
Commit
51809e4c
authored
10 years ago
by
Christopher Lane
Browse files
Options
Download
Email Patches
Plain Diff
Fix failure logic in add account activity
Bug: 17756080 Change-Id: I460db397b39ccc858b25b252624fa452b0cbb206
parent
060cc166
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
Settings/src/com/android/tv/settings/accounts/AddAccountWithTypeActivity.java
...roid/tv/settings/accounts/AddAccountWithTypeActivity.java
+8
-2
No files found.
Settings/src/com/android/tv/settings/accounts/AddAccountWithTypeActivity.java
View file @
51809e4c
...
...
@@ -68,16 +68,20 @@ public class AddAccountWithTypeActivity extends Activity {
super
.
onCreate
(
savedInstanceState
);
String
accountType
=
getIntent
().
getStringExtra
(
AccountManager
.
KEY_ACCOUNT_TYPE
);
if
(
accountType
!=
null
)
{
mLaunchAccountTypePicker
=
false
;
startAddAccount
(
accountType
);
}
else
{
mLaunchAccountTypePicker
=
true
;
startAccountTypePicker
();
}
}
@Override
protected
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
if
(
Activity
.
RESULT_CANCELED
==
resultCode
)
{
setResult
(
resultCode
);
finish
();
return
;
}
switch
(
requestCode
)
{
case
REQUEST_ADD_ACCOUNT:
if
(
resultCode
==
Activity
.
RESULT_OK
)
{
...
...
@@ -101,11 +105,13 @@ public class AddAccountWithTypeActivity extends Activity {
}
private
void
startAccountTypePicker
()
{
mLaunchAccountTypePicker
=
true
;
Intent
i
=
new
Intent
(
CHOOSE_ACCOUNT_TYPE_ACTION
);
startActivityForResult
(
i
,
REQUEST_CHOOSE_ACCOUNT_TYPE
);
}
private
void
startAddAccount
(
String
accountType
)
{
mLaunchAccountTypePicker
=
false
;
AccountManager
.
get
(
this
).
addAccount
(
accountType
,
null
,
/* authTokenType */
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment