OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8a35cbf
d045252
)
Merge "Not clearing data for a package that is a DO or PO" into nyc-dev
author
Suprabh Shukla
<suprabh@google.com>
Fri, 4 Mar 2016 20:38:43 +0000
(20:38 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 4 Mar 2016 20:38:44 +0000
(20:38 +0000)
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/pm/PackageManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc
services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
diff --cc
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index
deb4331
,
e865056
..
d8aa5d7
---
1
/
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
---
2
/
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@@
-31,9
-31,7
+31,8
@@@
import com.google.android.collect.Sets
import android.Manifest.permission;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.accounts.AccountManager;
+import android.annotation.IntDef;
import android.annotation.NonNull;
- import android.annotation.Nullable;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.ActivityManagerNative;