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

Commit f7ad5af4 authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

Merge "Add @UnsupportedAppUsage to methods known to be used by apps" am: faedae59 am: fe642a81 

am: 47b4ad2c

Change-Id: I6a85a7960825a6f2471338b17f8b9cf8497b8e10
parents 31f977a4 47b4ad2c

core/java/android/os/ParcelUuid.java

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.os;



import android.annotation.UnsupportedAppUsage;



import java.util.UUID;



/**
@@ -109,6 +111,7 @@ public final class ParcelUuid implements Parcelable { 


   public static final Parcelable.Creator<ParcelUuid> CREATOR =

               new Parcelable.Creator<ParcelUuid>() {

        @UnsupportedAppUsage

        public ParcelUuid createFromParcel(Parcel source) {

            long mostSigBits = source.readLong();

            long leastSigBits = source.readLong();

core/java/android/os/SELinux.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.os;



import android.annotation.UnsupportedAppUsage;

import android.util.Slog;



import java.io.File;
@@ -69,6 +70,7 @@ public class SELinux { 
     * @param path the pathname of the file object.

     * @return a security context given as a String.

     */

    @UnsupportedAppUsage

    public static final native String getFileContext(String path);



    /**

core/java/com/android/internal/util/StateMachine.java

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.internal.util;



import android.annotation.UnsupportedAppUsage;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.Looper;
@@ -1354,6 +1355,7 @@ public class StateMachine { 
     * Add a new state to the state machine, parent will be null

     * @param state to add

     */

    @UnsupportedAppUsage

    public final void addState(State state) {

        mSmHandler.addState(state, null);

    }
@@ -1372,6 +1374,7 @@ public class StateMachine { 
     *

     * @param initialState is the state which will receive the first message.

     */

    @UnsupportedAppUsage

    public final void setInitialState(State initialState) {

        mSmHandler.setInitialState(initialState);

    }
@@ -1410,6 +1413,7 @@ public class StateMachine { 
     *

     * @param destState will be the state that receives the next message.

     */

    @UnsupportedAppUsage

    public final void transitionTo(IState destState) {

        mSmHandler.transitionTo(destState);

    }
@@ -2053,6 +2057,7 @@ public class StateMachine { 
    /**

     * Start the state machine.

     */

    @UnsupportedAppUsage

    public void start() {

        // mSmHandler can be null if the state machine has quit.

        SmHandler smh = mSmHandler;