Merge tag 'android-6.0.1_r74' into HEAD

CYNGNOS-3303

Android 6.0.1 release 74

Change-Id: Id902564eaffb5084650acbee5f9b853fba21cc86

1 files changed, 10 insertions, 1 deletions

diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index 5753459..c3f2a5f 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -21,6 +21,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.text.TextUtils;
+import android.provider.Settings.Global;
 import android.view.View;
 
 import com.android.internal.logging.MetricsLogger;
@@ -50,6 +51,12 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
             learnMoreButton.setOnClickListener(this);
         }
 
+        final View learnMoreButton = findViewById(R.id.learn_more_button);
+        learnMoreButton.setOnClickListener(this);
+        if (Global.getInt(getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
+            learnMoreButton.setVisibility(View.GONE);
+        }
+
         final int passwordQuality = new ChooseLockSettingsHelper(this).utils()
                 .getActivePasswordQuality(UserHandle.myUserId());
         mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
@@ -100,7 +107,9 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
     private void launchFingerprintHelp() {
         Intent helpIntent = HelpUtils.getHelpIntent(this,
                 getString(R.string.help_url_fingerprint), getClass().getName());
-        startActivity(helpIntent);
+        if (helpIntent != null) {
+            startActivity(helpIntent);
+        }
     }
 
     @Override