OSDN Git Service

[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
authorMaurice Lam <yukl@google.com>
Tue, 6 Sep 2016 23:08:45 +0000 (23:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Sep 2016 23:08:45 +0000 (23:08 +0000)
am: c94f2b93af

Change-Id: Ib66b9b9d6b97fe1299a24b0c92991b4bd6a46656

1  2 
src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java

@@@ -20,9 -20,9 +20,10 @@@ import android.app.admin.DevicePolicyMa
  import android.content.Intent;
  import android.os.Bundle;
  import android.os.UserHandle;
+ import android.provider.Settings.Global;
  import android.view.View;
  
 +import com.android.internal.logging.MetricsLogger;
  import com.android.settings.ChooseLockSettingsHelper;
  import com.android.settings.HelpUtils;
  import com.android.settings.R;
@@@ -91,11 -95,8 +96,13 @@@ public class FingerprintEnrollIntroduct
      private void launchFingerprintHelp() {
          Intent helpIntent = HelpUtils.getHelpIntent(this,
                  getString(R.string.help_url_fingerprint), getClass().getName());
-         startActivity(helpIntent);
+         if (helpIntent != null) {
+             startActivity(helpIntent);
+         }
      }
 +
 +    @Override
 +    protected int getMetricsCategory() {
 +        return MetricsLogger.FINGERPRINT_ENROLL_INTRO;
 +    }
  }