diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-10-09 00:14:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-09 00:14:54 +0000 |
| commit | 0761b1b5ebb453a411e3289c1c972dbfddcee880 (patch) | |
| tree | 89fd89ca411db94e8153296d495e28ea5609176b /services/core | |
| parent | 985d59d7e3e676a02892b2a5e131510a993b3449 (diff) | |
| parent | 89b196958fee07475765bd3c458098464ba16f2e (diff) | |
| download | frameworks_base-0761b1b5ebb453a411e3289c1c972dbfddcee880.zip frameworks_base-0761b1b5ebb453a411e3289c1c972dbfddcee880.tar.gz frameworks_base-0761b1b5ebb453a411e3289c1c972dbfddcee880.tar.bz2 | |
am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit '89b196958fee07475765bd3c458098464ba16f2e':
Put in real "code" (aka marketing) name.
Diffstat (limited to 'services/core')
3 files changed, 4 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index f430c56..0b253f5 100755 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -31,7 +31,6 @@ import android.os.Looper; import android.os.SystemProperties; import android.util.ArrayMap; import android.util.ArraySet; -import com.android.internal.app.ProcessMap; import com.android.internal.app.ProcessStats; import com.android.internal.os.BatteryStatsImpl; import com.android.internal.os.TransferPipe; @@ -591,7 +590,7 @@ public final class ActiveServices { r.cancelNotification(); r.foregroundId = 0; r.foregroundNoti = null; - } else if (r.appInfo.targetSdkVersion >= Build.VERSION_CODES.L) { + } else if (r.appInfo.targetSdkVersion >= Build.VERSION_CODES.LOLLIPOP) { r.stripForegroundServiceFlagFromNotification(); } } diff --git a/services/core/java/com/android/server/dreams/DreamManagerService.java b/services/core/java/com/android/server/dreams/DreamManagerService.java index 985f77a..4521c28 100644 --- a/services/core/java/com/android/server/dreams/DreamManagerService.java +++ b/services/core/java/com/android/server/dreams/DreamManagerService.java @@ -262,7 +262,7 @@ public final class DreamManagerService extends SystemService { if (serviceInfo == null) { Slog.w(TAG, "Dream " + component + " does not exist"); return false; - } else if (serviceInfo.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.L + } else if (serviceInfo.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.LOLLIPOP && !BIND_DREAM_SERVICE.equals(serviceInfo.permission)) { Slog.w(TAG, "Dream " + component + " is not available because its manifest is missing the " + BIND_DREAM_SERVICE diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java index 13fbf6c..0c7d71b 100644 --- a/services/core/java/com/android/server/notification/ManagedServices.java +++ b/services/core/java/com/android/server/notification/ManagedServices.java @@ -496,7 +496,7 @@ abstract public class ManagedServices { synchronized (mMutex) { try { ManagedServiceInfo info = newServiceInfo(service, component, userid, - true /*isSystem*/, null, Build.VERSION_CODES.L); + true /*isSystem*/, null, Build.VERSION_CODES.LOLLIPOP); service.asBinder().linkToDeath(info, 0); mServices.add(info); return info; @@ -585,7 +585,7 @@ abstract public class ManagedServices { } public boolean supportsProfiles() { - return targetSdkVersion >= Build.VERSION_CODES.L; + return targetSdkVersion >= Build.VERSION_CODES.LOLLIPOP; } @Override |