Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c312f0f7 authored Mar 30, 2021 by Chavi Weingarten Committed by Android (Google) Code Review Mar 30, 2021

Merge "Add throttling to generateDisplayHash" into sc-dev

parents 179ae14e 2e605fd6

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -51550,6 +51550,7 @@ package android.view.displayhash {
		field public static final int DISPLAY_HASH_ERROR_INVALID_HASH_ALGORITHM = -5; // 0xfffffffb
		field public static final int DISPLAY_HASH_ERROR_MISSING_WINDOW = -3; // 0xfffffffd
		field public static final int DISPLAY_HASH_ERROR_NOT_VISIBLE_ON_SCREEN = -4; // 0xfffffffc
		field public static final int DISPLAY_HASH_ERROR_TOO_MANY_REQUESTS = -6; // 0xfffffffa
		field public static final int DISPLAY_HASH_ERROR_UNKNOWN = -1; // 0xffffffff
		}

core/api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -321,6 +321,7 @@ package android {
		field public static final int requiredSystemPropertyValue = 16844134; // 0x1010566
		field public static final int sdkVersion = 16844304; // 0x1010610
		field public static final int supportsAmbientMode = 16844173; // 0x101058d
		field public static final int throttleDurationMillis = 16844360; // 0x1010648
		field public static final int userRestriction = 16844164; // 0x1010584
		}

		@@ -9794,6 +9795,7 @@ package android.service.displayhash {
		method @NonNull public abstract java.util.Map<java.lang.String,android.service.displayhash.DisplayHashParams> onGetDisplayHashAlgorithms();
		method @Nullable public abstract android.view.displayhash.VerifiedDisplayHash onVerifyDisplayHash(@NonNull byte[], @NonNull android.view.displayhash.DisplayHash);
		field public static final String SERVICE_INTERFACE = "android.service.displayhash.DisplayHasherService";
		field public static final String SERVICE_META_DATA = "android.displayhash.display_hasher_service";
		}

		}

core/api/test-current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -2877,6 +2877,14 @@ package android.view.contentcapture {

		}

		package android.view.displayhash {

		public final class DisplayHashManager {
		method @RequiresPermission("android.permission.READ_FRAME_BUFFER") public void setDisplayHashThrottlingEnabled(boolean);
		}

		}

		package android.view.inputmethod {

		public final class InlineSuggestion implements android.os.Parcelable {

core/java/android/service/displayhash/DisplayHasherService.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,16 @@ public abstract class DisplayHasherService extends Service {
		public static final String EXTRA_VERIFIED_DISPLAY_HASH =
		"android.service.displayhash.extra.VERIFIED_DISPLAY_HASH";

		/**
		* Name under which a DisplayHasherService component publishes information
		* about itself. This meta-data must reference an XML resource containing a
		* {@link com.android.internal.R.styleable#DisplayHasherService} tag.
		*
		* @hide
		*/
		@SystemApi
		public static final String SERVICE_META_DATA = "android.displayhash.display_hasher_service";

		/**
		* The {@link Intent} action that must be declared as handled by a service in its manifest
		* for the system to recognize it as a DisplayHash providing service.

core/java/android/view/IWindowManager.aidl

+9 −0

Original line number	Diff line number	Diff line
		@@ -776,6 +776,15 @@ interface IWindowManager
		*/
		VerifiedDisplayHash verifyDisplayHash(in DisplayHash displayHash);

		/**
		* Call to enable or disable the throttling when generating a display hash. This should only be
		* used for testing. Throttling is enabled by default.
		*
		* Must be called from a process that has {@link android.Manifest.permission#READ_FRAME_BUFFER}
		* permission.
		*/
		void setDisplayHashThrottlingEnabled(boolean enable);

		/**
		* Registers a listener for a {@link android.window.WindowContext} to handle configuration
		* changes from the server side.