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

Merge "Fixed build breakage"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-01 05:44:02 +00:00
committed by Android (Google) Code Review
parent 9a43f654d7 eea34ee986
commit f9d0d612b9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/TaskRecord.java
View File

@@ -265,7 +265,7 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi
/** Indication of what to run next when task exits. */
// TODO: Shouldn't be needed if we have things in visual order. I.e. we stop using stacks or
// have a stack per standard application type...
@WindowConfiguration.ActivityType
/*@WindowConfiguration.ActivityType*/
private int mTaskToReturnTo = ACTIVITY_TYPE_STANDARD;
/** If original intent did not allow relinquishing task identity, save that information */
@@ -887,7 +887,7 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi
return this.intent.filterEquals(intent);
}
void setTaskToReturnTo(@WindowConfiguration.ActivityType int taskToReturnTo) {
void setTaskToReturnTo(/*@WindowConfiguration.ActivityType*/ int taskToReturnTo) {
mTaskToReturnTo = taskToReturnTo == ACTIVITY_TYPE_RECENTS
? ACTIVITY_TYPE_HOME : taskToReturnTo;
}
@@ -1142,7 +1142,7 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi
}
@Override
@WindowConfiguration.ActivityType
/*@WindowConfiguration.ActivityType*/
public int getActivityType() {
final int applicationType = super.getActivityType();
if (applicationType != ACTIVITY_TYPE_UNDEFINED || mActivities.isEmpty()) {

10
services/core/java/com/android/server/wm/ConfigurationContainer.java
View File

@@ -130,20 +130,20 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> {
}
/** Sets the windowing mode for the configuration container. */
public void setWindowingMode(@WindowConfiguration.WindowingMode int windowingMode) {
public void setWindowingMode(/*@WindowConfiguration.WindowingMode*/ int windowingMode) {
mTmpConfig.setTo(getOverrideConfiguration());
mTmpConfig.windowConfiguration.setWindowingMode(windowingMode);
onOverrideConfigurationChanged(mTmpConfig);
}
/** Returns the activity type associated with the the configuration container. */
@WindowConfiguration.ActivityType
/*@WindowConfiguration.ActivityType*/
public int getActivityType() {
return mFullConfiguration.windowConfiguration.getActivityType();
}
/** Sets the activity type to associate with the configuration container. */
public void setActivityType(@WindowConfiguration.ActivityType int activityType) {
public void setActivityType(/*@WindowConfiguration.ActivityType*/ int activityType) {
int currentActivityType = getActivityType();
if (currentActivityType == activityType) {
return;
@@ -174,8 +174,8 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> {
}
public boolean hasCompatibleActivityType(ConfigurationContainer other) {
@WindowConfiguration.ActivityType int thisType = getActivityType();
@WindowConfiguration.ActivityType int otherType = other.getActivityType();
/*@WindowConfiguration.ActivityType*/ int thisType = getActivityType();
/*@WindowConfiguration.ActivityType*/ int otherType = other.getActivityType();
return thisType == otherType
|| thisType == ACTIVITY_TYPE_UNDEFINED