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

Commit 722ee0ae authored by ChengYou Ho's avatar ChengYou Ho Committed by Automerger Merge Worker
Browse files

Change WeaverConfig data types to int am: c9945ab2 am: 18d02e3a am: 523354c8

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1671790

Change-Id: Ica6abe9512aa4c0ea602da80cff271021fc899f1
parents cf2ae43e 523354c8
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *////////////////////////////////////////////////////////////////////////////////
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

@@ -37,6 +38,6 @@ interface IWeaver {
  android.hardware.weaver.WeaverReadResponse read(in int slotId, in byte[] key);
  void write(in int slotId, in byte[] key, in byte[] value);
  const int STATUS_FAILED = 1;
  const int INCORRECT_KEY = 2;
  const int THROTTLE = 3;
  const int STATUS_INCORRECT_KEY = 2;
  const int STATUS_THROTTLE = 3;
}
+5 −4
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *////////////////////////////////////////////////////////////////////////////////
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

@@ -33,7 +34,7 @@
package android.hardware.weaver;
@VintfStability
parcelable WeaverConfig {
  long slots;
  long keySize;
  long valueSize;
  int slots;
  int keySize;
  int valueSize;
}
+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *////////////////////////////////////////////////////////////////////////////////
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

+2 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ interface IWeaver {
     * Read binder calls may return a ServiceSpecificException with the following error codes.
     */
    const int STATUS_FAILED = 1;
    const int INCORRECT_KEY = 2;
    const int THROTTLE = 3;
    const int STATUS_INCORRECT_KEY = 2;
    const int STATUS_THROTTLE = 3;

    /**
     * Attempts to retrieve the value stored in the identified slot.
+3 −3
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ parcelable WeaverConfig {
    /**
     * The number of slots available.
     */
    long slots;
    int slots;
    /**
     * The number of bytes used for a key.
     */
    long keySize;
    int keySize;
    /**
     * The number of bytes used for a value.
     */
    long valueSize;
    int valueSize;
}
Loading