Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: e261ea2195

Change-Id: I184f06046d89a182f505508351bf64f29072467a
This commit is contained in:
Jeff Sharkey
2017-05-18 16:23:23 +00:00
committed by android-build-merger
parent 12f4b76db2 e261ea2195
commit d35ec686d7
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/notification/NotificationRecord.java
View File

@@ -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;
}
}

2
services/core/java/com/android/server/notification/RankingHelper.java
View File

@@ -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;
}

2
services/tests/notification/src/com/android/server/notification/NotificationRecordTest.java
View File

@@ -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);

2
services/tests/notification/src/com/android/server/notification/RankingHelperTest.java
View File

@@ -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);