ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #400 from 0002647302/master 

isEmpty() is an API 9 + call. Currently we still support 8+
This commit is contained in:
TwistedUmbrella 2014-03-06 04:38:09 -05:00
parent 03231f51f2 db1f4d24c5
commit 8dc18039be
1 changed files with 1 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
shell/android/src/com/reicast/emulator/AboutFragment.java
View File

@ -1,58 +1,3 @@
/* ====================================================================
* Copyright (c) 2012-2013 Lounge Katt Entertainment. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. All advertising materials mentioning features or use of this
* software must display the following acknowledgment:
* "This product includes software developed by Lounge Katt" unless
* otherwise displayed by public repository entries.
*
* 4. The names "Lounge Katt", "TwistedUmbrella", and "LiveLog"
* must not be used to endorse or promote products derived from this
* software without prior written permission. For written permission,
* please contact admin@loungekatt.com.
*
* 5. Products derived from this software may not be called "LiveLog"
* nor may "LiveLog" appear in their names without prior written
* permission of Lounge Katt Entertainment.
*
* 6. Redistributions of any form whatsoever must retain the following
* acknowledgment:
* "This product includes software developed by Lounge Katt" unless
* otherwise displayed by tagged repository entries.
*
* THIS SOFTWARE IS PROVIDED BY Lounge Katt ``AS IS'' AND ANY
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
* ====================================================================
*
* The license and distribution terms for any publicly available version or
* derivative of this code cannot be changed. i.e. this code cannot simply be
* copied and put under another distribution license
* [including the GNU Public License.] Content not subject to these terms is
* subject to to the terms and conditions of the Apache License, Version 2.0.
*/
package com.reicast.emulator;
import java.io.BufferedReader;
@ -70,7 +15,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
@SuppressWarnings("deprecation")
public class AboutFragment extends Fragment {
String buildId = "";
@ -109,7 +53,7 @@ public class AboutFragment extends Fragment {
R.id.revision_text);
String revision = getString(R.string.revision_text,
versionName, String.valueOf(versionCode));
if (!buildId.isEmpty()) {
if (!buildId.equals("")) {
revision = getString(R.string.revision_text,
versionName, buildId.substring(0,7));
}