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

Commit 6190d9cf authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Add flags to requests for package UID/GIDs."

parents 055b82aa 8588bc1e

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -9447,8 +9447,10 @@ package android.content.pm { 
    method public abstract java.lang.String getNameForUid(int);

    method public android.content.pm.PackageInfo getPackageArchiveInfo(java.lang.String, int);

    method public abstract int[] getPackageGids(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract int[] getPackageGids(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract android.content.pm.PackageInfo getPackageInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract android.content.pm.PackageInstaller getPackageInstaller();

    method public abstract int getPackageUid(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract java.lang.String[] getPackagesForUid(int);

    method public abstract java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(java.lang.String[], int);

    method public abstract android.content.pm.PermissionGroupInfo getPermissionGroupInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
@@ -36752,8 +36754,10 @@ package android.test.mock { 
    method public android.content.Intent getLeanbackLaunchIntentForPackage(java.lang.String);

    method public java.lang.String getNameForUid(int);

    method public int[] getPackageGids(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public int[] getPackageGids(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public android.content.pm.PackageInfo getPackageInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public android.content.pm.PackageInstaller getPackageInstaller();

    method public int getPackageUid(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public java.lang.String[] getPackagesForUid(int);

    method public java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(java.lang.String[], int);

    method public android.content.pm.PermissionGroupInfo getPermissionGroupInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -9748,8 +9748,10 @@ package android.content.pm { 
    method public abstract java.lang.String getNameForUid(int);

    method public android.content.pm.PackageInfo getPackageArchiveInfo(java.lang.String, int);

    method public abstract int[] getPackageGids(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract int[] getPackageGids(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract android.content.pm.PackageInfo getPackageInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract android.content.pm.PackageInstaller getPackageInstaller();

    method public abstract int getPackageUid(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract java.lang.String[] getPackagesForUid(int);

    method public abstract java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(java.lang.String[], int);

    method public abstract int getPermissionFlags(java.lang.String, java.lang.String, android.os.UserHandle);
@@ -39093,8 +39095,10 @@ package android.test.mock { 
    method public android.content.Intent getLeanbackLaunchIntentForPackage(java.lang.String);

    method public java.lang.String getNameForUid(int);

    method public int[] getPackageGids(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public int[] getPackageGids(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public android.content.pm.PackageInfo getPackageInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public android.content.pm.PackageInstaller getPackageInstaller();

    method public int getPackageUid(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public java.lang.String[] getPackagesForUid(int);

    method public java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(java.lang.String[], int);

    method public int getPermissionFlags(java.lang.String, java.lang.String, android.os.UserHandle);

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -9455,8 +9455,10 @@ package android.content.pm { 
    method public abstract java.lang.String getNameForUid(int);

    method public android.content.pm.PackageInfo getPackageArchiveInfo(java.lang.String, int);

    method public abstract int[] getPackageGids(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract int[] getPackageGids(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract android.content.pm.PackageInfo getPackageInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract android.content.pm.PackageInstaller getPackageInstaller();

    method public abstract int getPackageUid(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract java.lang.String[] getPackagesForUid(int);

    method public abstract java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(java.lang.String[], int);

    method public abstract android.content.pm.PermissionGroupInfo getPermissionGroupInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
@@ -36768,8 +36770,10 @@ package android.test.mock { 
    method public android.content.Intent getLeanbackLaunchIntentForPackage(java.lang.String);

    method public java.lang.String getNameForUid(int);

    method public int[] getPackageGids(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public int[] getPackageGids(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public android.content.pm.PackageInfo getPackageInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public android.content.pm.PackageInstaller getPackageInstaller();

    method public int getPackageUid(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method public java.lang.String[] getPackagesForUid(int);

    method public java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(java.lang.String[], int);

    method public android.content.pm.PermissionGroupInfo getPermissionGroupInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;

core/java/android/annotation/AppIdInt.java

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * 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.

 */



package android.annotation;



import static java.lang.annotation.ElementType.FIELD;

import static java.lang.annotation.ElementType.METHOD;

import static java.lang.annotation.ElementType.PARAMETER;

import static java.lang.annotation.RetentionPolicy.SOURCE;



import java.lang.annotation.Retention;

import java.lang.annotation.Target;



/**

 * Denotes that the annotated element is a multi-user application ID. This is

 * <em>not</em> the same as a UID.

 *

 * @hide

 */

@Retention(SOURCE)

@Target({METHOD, PARAMETER, FIELD})

public @interface AppIdInt {

}

core/java/android/annotation/UserIdInt.java

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * 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.

 */



package android.annotation;



import static java.lang.annotation.ElementType.FIELD;

import static java.lang.annotation.ElementType.METHOD;

import static java.lang.annotation.ElementType.PARAMETER;

import static java.lang.annotation.RetentionPolicy.SOURCE;



import java.lang.annotation.Retention;

import java.lang.annotation.Target;



/**

 * Denotes that the annotated element is a multi-user user ID. This is

 * <em>not</em> the same as a UID.

 *

 * @hide

 */

@Retention(SOURCE)

@Target({METHOD, PARAMETER, FIELD})

public @interface UserIdInt {

}