PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash in AndroidBeam class." into nyc-dev

Browse Source 
am: 2fff06e

* commit '2fff06e91816ff787dfcbaf4de3cb71f9ce91282':
  Fix crash in AndroidBeam class.
This commit is contained in:
Sudheer Shanka
2016-03-28 17:32:35 +00:00
committed by android-build-merger
parent 0e4d7cf33f 2fff06e918
commit d459e35577
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/nfc/AndroidBeam.java
View File

@@ -47,7 +47,7 @@ public class AndroidBeam extends InstrumentedFragment
private SwitchBar mSwitchBar; private SwitchBar mSwitchBar;
private CharSequence mOldActivityTitle; private CharSequence mOldActivityTitle;
private boolean mBeamDisallowedByBase; private boolean mBeamDisallowedByBase;
private boolean mBeamDisallowedByAdmin; private boolean mBeamDisallowedByOnlyAdmin;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@@ -81,7 +81,7 @@ public class AndroidBeam extends InstrumentedFragment
View view = inflater.inflate(R.layout.admin_support_details_empty_view, null); View view = inflater.inflate(R.layout.admin_support_details_empty_view, null);
ShowAdminSupportDetailsDialog.setAdminSupportDetails(getActivity(), view, admin, false); ShowAdminSupportDetailsDialog.setAdminSupportDetails(getActivity(), view, admin, false);
view.setVisibility(View.VISIBLE); view.setVisibility(View.VISIBLE);
mBeamDisallowedByAdmin = true; mBeamDisallowedByOnlyAdmin = true;
return view; return view;
} }
mView = inflater.inflate(R.layout.android_beam, container, false); mView = inflater.inflate(R.layout.android_beam, container, false);
@@ -95,7 +95,7 @@ public class AndroidBeam extends InstrumentedFragment
SettingsActivity activity = (SettingsActivity) getActivity(); SettingsActivity activity = (SettingsActivity) getActivity();
mSwitchBar = activity.getSwitchBar(); mSwitchBar = activity.getSwitchBar();
if (!mBeamDisallowedByBase && mBeamDisallowedByAdmin) { if (mBeamDisallowedByOnlyAdmin) {
mSwitchBar.hide(); mSwitchBar.hide();
} else { } else {
mSwitchBar.setChecked(!mBeamDisallowedByBase && mNfcAdapter.isNdefPushEnabled()); mSwitchBar.setChecked(!mBeamDisallowedByBase && mNfcAdapter.isNdefPushEnabled());
@@ -111,8 +111,10 @@ public class AndroidBeam extends InstrumentedFragment
if (mOldActivityTitle != null) { if (mOldActivityTitle != null) {
getActivity().getActionBar().setTitle(mOldActivityTitle); getActivity().getActionBar().setTitle(mOldActivityTitle);
} }
mSwitchBar.removeOnSwitchChangeListener(this); if (!mBeamDisallowedByOnlyAdmin) {
mSwitchBar.hide(); mSwitchBar.removeOnSwitchChangeListener(this);
mSwitchBar.hide();
}
} }
@Override @Override