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

Commit bcab1a93 authored by Diogo Ferreira's avatar Diogo Ferreira Committed by Gerrit Code Review
Browse files

Merge "Add @hide to new fields/methods" into ics

parents 0f2b75d1 6bfebbb0

core/java/android/app/Profile.java

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ import java.util.HashMap; 
import java.util.Map;

import java.util.UUID;



/**

 * @hide

 */

public final class Profile implements Parcelable {



    private String mName;

core/java/android/app/ProfileGroup.java

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ import android.util.Log; 
import java.io.IOException;

import java.util.UUID;



/**

 * @hide

 */

public final class ProfileGroup implements Parcelable {

    private static final String TAG = "ProfileGroup";

core/java/android/app/ProfileManager.java

+5 −3
Original line number Diff line number Diff line
@@ -26,8 +26,10 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.util.Log;



public class ProfileManager

{

/**

 * @hide

 */

public class ProfileManager {



    private static IProfileManager sService;

core/java/android/content/Context.java

+2 −0
Original line number Diff line number Diff line
@@ -1518,6 +1518,8 @@ public abstract class Context { 
     *

     * @see #getSystemService

     * @see android.app.ProfileManager

     *

     * @hide

     */

    public static final String PROFILE_SERVICE = "profile";