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

Commit d35ec686 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Unbreak APK 26 apps running on "O" preview/beta builds." into oc-dev am: 91f674ee 

am: e261ea21

Change-Id: I184f06046d89a182f505508351bf64f29072467a
parents 12f4b76d e261ea21

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

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public final class NotificationRecord { 
                  final ApplicationInfo applicationInfo =

                        mContext.getPackageManager().getApplicationInfoAsUser(sbn.getPackageName(),

                                0, UserHandle.getUserId(sbn.getUid()));

                if (applicationInfo.targetSdkVersion <= Build.VERSION_CODES.N_MR1) {

                if (applicationInfo.targetSdkVersion < Build.VERSION_CODES.O) {

                    return true;

                }

            }

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

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ public class RankingHelper implements RankingConfig { 
    private boolean shouldHaveDefaultChannel(Record r) throws NameNotFoundException {

        final int userId = UserHandle.getUserId(r.uid);

        final ApplicationInfo applicationInfo = mPm.getApplicationInfoAsUser(r.pkg, 0, userId);

        if (applicationInfo.targetSdkVersion > Build.VERSION_CODES.N_MR1) {

        if (applicationInfo.targetSdkVersion >= Build.VERSION_CODES.O) {

            // O apps should not have the default channel.

            return false;

        }

services/tests/notification/src/com/android/server/notification/NotificationRecordTest.java

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ public class NotificationRecordTest extends NotificationTestCase { 
        when(mMockContext.getPackageManager()).thenReturn(mPm);



        legacy.targetSdkVersion = Build.VERSION_CODES.N_MR1;

        upgrade.targetSdkVersion = Build.VERSION_CODES.N_MR1 + 1;

        upgrade.targetSdkVersion = Build.VERSION_CODES.O;

        try {

            when(mPm.getApplicationInfoAsUser(eq(pkg), anyInt(), anyInt())).thenReturn(legacy);

            when(mPm.getApplicationInfoAsUser(eq(pkg2), anyInt(), anyInt())).thenReturn(upgrade);

services/tests/notification/src/com/android/server/notification/RankingHelperTest.java

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public class RankingHelperTest extends NotificationTestCase { 
        final ApplicationInfo legacy = new ApplicationInfo();

        legacy.targetSdkVersion = Build.VERSION_CODES.N_MR1;

        final ApplicationInfo upgrade = new ApplicationInfo();

        upgrade.targetSdkVersion = Build.VERSION_CODES.N_MR1 + 1;

        upgrade.targetSdkVersion = Build.VERSION_CODES.O;

        when(mPm.getApplicationInfoAsUser(eq(PKG), anyInt(), anyInt())).thenReturn(legacy);

        when(mPm.getApplicationInfoAsUser(eq(UPDATED_PKG), anyInt(), anyInt())).thenReturn(upgrade);

        when(mPm.getPackageUidAsUser(eq(PKG), anyInt())).thenReturn(UID);