Merge "Remove old methods : AlwaysOnHotwordDetector" into lmp-dev (2b02f887) · Commits · e / os / android_frameworks_base

core/java/android/service/voice/AlwaysOnHotwordDetector.java

+0 −39

Original line number	Diff line number	Diff line
		@@ -467,19 +467,6 @@ public class AlwaysOnHotwordDetector {
		}
		}

		/**
		* FIXME: Remove once the prebuilts are updated.
		*
		* @hide
		*/
		@Deprecated
		public Intent createIntentToEnroll() {
		if (DBG) Slog.d(TAG, "createIntentToEnroll");
		synchronized (mLock) {
		return getManageIntentLocked(MANAGE_ACTION_ENROLL);
		}
		}

		/**
		* Creates an intent to start the un-enrollment for the associated keyphrase.
		* This intent must be invoked using {@link Activity#startActivityForResult(Intent, int)}.
		@@ -501,19 +488,6 @@ public class AlwaysOnHotwordDetector {
		}
		}

		/**
		* FIXME: Remove once the prebuilts are updated.
		*
		* @hide
		*/
		@Deprecated
		public Intent createIntentToUnEnroll() {
		if (DBG) Slog.d(TAG, "createIntentToUnEnroll");
		synchronized (mLock) {
		return getManageIntentLocked(MANAGE_ACTION_UN_ENROLL);
		}
		}

		/**
		* Creates an intent to start the re-enrollment for the associated keyphrase.
		* This intent must be invoked using {@link Activity#startActivityForResult(Intent, int)}.
		@@ -535,19 +509,6 @@ public class AlwaysOnHotwordDetector {
		}
		}

		/**
		* FIXME: Remove once the prebuilts are updated.
		*
		* @hide
		*/
		@Deprecated
		public Intent createIntentToReEnroll() {
		if (DBG) Slog.d(TAG, "createIntentToReEnroll");
		synchronized (mLock) {
		return getManageIntentLocked(MANAGE_ACTION_RE_ENROLL);
		}
		}

		private Intent getManageIntentLocked(int action) {
		if (mAvailability == STATE_INVALID) {
		throw new IllegalStateException("getManageIntent called on an invalid detector");