diff options
| author | Dan Egnor <egnor@google.com> | 2009-12-11 14:55:24 -0800 |
|---|---|---|
| committer | Dan Egnor <egnor@google.com> | 2009-12-11 14:55:24 -0800 |
| commit | d021302134460efbb596f4a4a2951e75b83d0ede (patch) | |
| tree | 0ad87a7fd4a63d68f2a72551a6a674c6f677051f /services/java/com/android/server/FallbackCheckinService.java | |
| parent | 07c71147dda8bda9a40bea10f6029d6cfcaae00f (diff) | |
| parent | f6bb01b0d81943a00a42e56f2e65549ca03c386d (diff) | |
resolved conflicts for merge of f6bb01b0 to master
Diffstat (limited to 'services/java/com/android/server/FallbackCheckinService.java')
| -rw-r--r-- | services/java/com/android/server/FallbackCheckinService.java | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/services/java/com/android/server/FallbackCheckinService.java b/services/java/com/android/server/FallbackCheckinService.java index 32c15e944757..1e5bc092d6cb 100644 --- a/services/java/com/android/server/FallbackCheckinService.java +++ b/services/java/com/android/server/FallbackCheckinService.java @@ -34,21 +34,11 @@ import com.google.android.net.ParentalControlState; public final class FallbackCheckinService extends ICheckinService.Stub { static final String TAG = "FallbackCheckinService"; final Context mContext; - + public FallbackCheckinService(Context context) { mContext = context; } - public boolean checkin() { - return false; // failure, because not implemented - } - - public void reportCrashSync(byte[] crashData) { - } - - public void reportCrashAsync(byte[] crashData) { - } - public void masterClear() { if (mContext.checkCallingOrSelfPermission("android.permission.MASTER_CLEAR") != PackageManager.PERMISSION_GRANTED) { |