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

Commit 9d6da0fc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into... 

Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master
parents ae21f0b0 0e0787f4

services/core/java/com/android/server/notification/NotificationManagerService.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -2189,6 +2189,11 @@ public class NotificationManagerService extends SystemService { 
        @Override

        @Override

        public boolean areNotificationsEnabledForPackage(String pkg, int uid) {

        public boolean areNotificationsEnabledForPackage(String pkg, int uid) {

            checkCallerIsSystemOrSameApp(pkg);

            checkCallerIsSystemOrSameApp(pkg);

            if (UserHandle.getCallingUserId() != UserHandle.getUserId(uid)) {

                getContext().enforceCallingPermission(

                        android.Manifest.permission.INTERACT_ACROSS_USERS,

                        "canNotifyAsPackage for uid " + uid);

            }





            return mRankingHelper.getImportance(pkg, uid) != IMPORTANCE_NONE;

            return mRankingHelper.getImportance(pkg, uid) != IMPORTANCE_NONE;

        }

        }

services/core/java/com/android/server/pm/PackageManagerService.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -18305,6 +18305,12 @@ public class PackageManagerService extends IPackageManager.Stub 
    @Override

    @Override

    public boolean isPackageDeviceAdminOnAnyUser(String packageName) {

    public boolean isPackageDeviceAdminOnAnyUser(String packageName) {

        final int callingUid = Binder.getCallingUid();

        final int callingUid = Binder.getCallingUid();

        if (checkUidPermission(android.Manifest.permission.MANAGE_USERS, callingUid)

                != PERMISSION_GRANTED) {

            EventLog.writeEvent(0x534e4554, "128599183", -1, "");

            throw new SecurityException(android.Manifest.permission.MANAGE_USERS

                    + " permission is required to call this API");

        }

        if (getInstantAppPackageName(callingUid) != null

        if (getInstantAppPackageName(callingUid) != null

                && !isCallerSameApp(packageName, callingUid)) {

                && !isCallerSameApp(packageName, callingUid)) {

            return false;

            return false;

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -3934,6 +3934,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
















    @Override







    @Override











    public boolean isSeparateProfileChallengeAllowed(int userHandle) {







    public boolean isSeparateProfileChallengeAllowed(int userHandle) {














        if (!isCallerWithSystemUid()) {














            throw new SecurityException("Caller must be system");














        }











        ComponentName profileOwner = getProfileOwner(userHandle);







        ComponentName profileOwner = getProfileOwner(userHandle);











        // Profile challenge is supported on N or newer release.







        // Profile challenge is supported on N or newer release.











        return profileOwner != null &&







        return profileOwner != null &&

































services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java



+19
−0




























Original line number
Original line
Diff line number
Diff line








@@ -34,6 +34,7 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON









import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR;







import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR;











import static android.content.pm.PackageManager.FEATURE_WATCH;







import static android.content.pm.PackageManager.FEATURE_WATCH;











import static android.content.pm.PackageManager.PERMISSION_DENIED;







import static android.content.pm.PackageManager.PERMISSION_DENIED;














import static android.content.pm.PackageManager.PERMISSION_GRANTED;











import static android.os.Build.VERSION_CODES.O_MR1;







import static android.os.Build.VERSION_CODES.O_MR1;











import static android.os.Build.VERSION_CODES.P;







import static android.os.Build.VERSION_CODES.P;






























@@ -106,6 +107,7 @@ import android.testing.AndroidTestingRunner;









import android.testing.TestableContext;







import android.testing.TestableContext;











import android.testing.TestableLooper;







import android.testing.TestableLooper;











import android.testing.TestableLooper.RunWithLooper;







import android.testing.TestableLooper.RunWithLooper;














import android.testing.TestablePermissions;











import android.text.Html;







import android.text.Html;











import android.util.ArrayMap;







import android.util.ArrayMap;











import android.util.AtomicFile;







import android.util.AtomicFile;










@@ -3145,4 +3147,21 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {





























        assertEquals(0, captor.getValue().getNotification().flags);







        assertEquals(0, captor.getValue().getNotification().flags);











    }







    }





























    @Test














    public void testAreNotificationsEnabledForPackage_crossUser() throws Exception {














        try {














            mBinderService.areNotificationsEnabledForPackage(mContext.getPackageName(),














                    mUid + UserHandle.PER_USER_RANGE);














            fail("Cannot call cross user without permission");














        } catch (SecurityException e) {














            // pass














        }





























        // cross user, with permission, no problem














        TestablePermissions perms = mContext.getTestablePermissions();














        perms.setPermission(android.Manifest.permission.INTERACT_ACROSS_USERS, PERMISSION_GRANTED);














        mBinderService.areNotificationsEnabledForPackage(mContext.getPackageName(),














                mUid + UserHandle.PER_USER_RANGE);














    }











}






}