diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-01-12 07:24:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-12 07:24:03 -0800 |
| commit | 0c33ba3800d105e094eb1bc5c5af9892ab21733f (patch) | |
| tree | 2469fb3ea99865b7b9c68b123a021476af63f001 /src/com | |
| parent | 87ec20cb906d9728de80471cf6b536c74237b0fc (diff) | |
| parent | 4d569da292a8a371098461d0763edd1393cdc712 (diff) | |
| download | packages_apps_Browser-0c33ba3800d105e094eb1bc5c5af9892ab21733f.tar.gz packages_apps_Browser-0c33ba3800d105e094eb1bc5c5af9892ab21733f.tar.bz2 packages_apps_Browser-0c33ba3800d105e094eb1bc5c5af9892ab21733f.zip | |
am 4d569da2: am c7b92f81: Use a "boolean" instead of a "Boolean"
Merge commit '4d569da292a8a371098461d0763edd1393cdc712'
* commit '4d569da292a8a371098461d0763edd1393cdc712':
Use a "boolean" instead of a "Boolean"
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index ae1e41b63..43e675876 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -1019,7 +1019,7 @@ public class BrowserActivity extends Activity mPageInfoDialog.dismiss(); showPageInfo( mPageInfoView, - mPageInfoFromShowSSLCertificateOnError.booleanValue()); + mPageInfoFromShowSSLCertificateOnError); } if (mSSLCertificateDialog != null) { mSSLCertificateDialog.dismiss(); @@ -2951,7 +2951,7 @@ public class BrowserActivity extends Activity ((TextView) pageInfoView.findViewById(R.id.title)).setText(title); mPageInfoView = tab; - mPageInfoFromShowSSLCertificateOnError = new Boolean(fromShowSSLCertificateOnError); + mPageInfoFromShowSSLCertificateOnError = fromShowSSLCertificateOnError; AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this) @@ -2964,7 +2964,6 @@ public class BrowserActivity extends Activity int whichButton) { mPageInfoDialog = null; mPageInfoView = null; - mPageInfoFromShowSSLCertificateOnError = null; // if we came here from the SSL error dialog if (fromShowSSLCertificateOnError) { @@ -2981,7 +2980,6 @@ public class BrowserActivity extends Activity public void onCancel(DialogInterface dialog) { mPageInfoDialog = null; mPageInfoView = null; - mPageInfoFromShowSSLCertificateOnError = null; // if we came here from the SSL error dialog if (fromShowSSLCertificateOnError) { @@ -3006,7 +3004,6 @@ public class BrowserActivity extends Activity int whichButton) { mPageInfoDialog = null; mPageInfoView = null; - mPageInfoFromShowSSLCertificateOnError = null; // if we came here from the SSL error dialog if (fromShowSSLCertificateOnError) { @@ -3699,7 +3696,7 @@ public class BrowserActivity extends Activity // If the Page-Info dialog is launched from the SSL-certificate-on-error // dialog, we should not just dismiss it, but should get back to the // SSL-certificate-on-error dialog. This flag is used to store this state - private Boolean mPageInfoFromShowSSLCertificateOnError; + private boolean mPageInfoFromShowSSLCertificateOnError; // as SSLCertificateOnError has different style for landscape / portrait, // we have to re-open it when configuration changed |